diff --git a/config.js b/config.js
index b5202a700c7..419dbc152c7 100644
--- a/config.js
+++ b/config.js
@@ -14,8 +14,8 @@ var config = new Settings(
 {
   elasticsearch:  'http://localhost:9200',
   kibana_index:   "kibana-int", 
-  modules:        ['histogram','map','map2','pie','table','stringquery','sort',
+  modules:        ['histogram','map','pie','table','stringquery','sort',
                   'timepicker','text','fields','hits','dashcontrol',
-                  'column', 'parallelcoordinates'],
+                  'column'],
   }
 );
diff --git a/panels/table/module.html b/panels/table/module.html
index fda7ab41378..6a70e0b1ac2 100644
--- a/panels/table/module.html
+++ b/panels/table/module.html
@@ -21,13 +21,18 @@
     <div class="small" ng-show="panel.fields.length == 0">No columns configured. You may want to add a <strong>fields panel</strong>, or click the edit button in the top right of this panel to add some columns</div>
     <table class="table-hover table table-condensed" ng-style="panel.style">
       <thead>
+        
         <th style="white-space:nowrap" ng-repeat="field in panel.fields">
+          <i ng-show="!$first" class="pointer link icon-caret-left" ng-click="_.move(panel.fields,$index,$index-1)"></i>
+
           <span  class="pointer" ng-click="set_sort(field)" ng-show='panel.sortable'>
             {{field}} 
-            <i ng-show='field == panel.sort[0]' class="pointer" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
-          </span>
-          <span ng-show='!panel.sortable'>{{field}}</span>
+            <i ng-show='field == panel.sort[0]' class="pointer link" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
+          </span> 
+          <span ng-show='!panel.sortable'>{{field}}</span> 
+          <i ng-show="!$last" class="pointer link icon-caret-right" ng-click="_.move(panel.fields,$index,$index+1)"></i>
         </th>
+      
       </thead>
       <tbody ng-repeat="row in data.slice(panel.offset,panel.offset+panel.size)" ng-class-odd="'odd'">
         <tr ng-click="toggle_details(row)">