diff --git a/panels/map2/editor.html b/panels/map2/editor.html
index 34de0f2b3df..aff91cd78ef 100644
--- a/panels/map2/editor.html
+++ b/panels/map2/editor.html
@@ -17,25 +17,35 @@
     </div>
 </div>
 
+
 <div class="row-fluid">
-    <div class="span3">
-        <form>
-            <h6>Field</h6>
-            <input type="text" class="input-small" ng-model="panel.field">
+    <div class="span10">
+        <form class="form-horizontal">
+            <div class="control-group">
+                <label class="control-label" for="panelfield">Primary Field</label>
+                <div class="controls">
+                    <input type="text" id="panelfield" class="input" ng-model="panel.field">
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="panelsecondaryfield">Secondary Field</label>
+                <div class="controls">
+                    <input type="text" id="panelsecondaryfield" class="input"
+                           ng-model="panel.secondaryfield"
+                           data-placement="right"
+                           placeholder="Optional"
+                           bs-tooltip="'Allows aggregating on Primary field, while counting stats on a secondary (e.g. Group By user_id, Sum(purchase_price)).'" />
+                </div>
+            </div>
+            <div class="control-group">
+                <label class="control-label" for="panelquery">Query</label>
+                <div class="controls">
+                    <input type="text" id="panelquery" class="input" ng-model="panel.query">
+                </div>
+            </div>
         </form>
     </div>
-
-    <div class="span6">
-        <form class="input-append">
-            <h6>Query</h6><input type="text" ng-model="panel.query">
-        </form>
-    </div>
-
-    <div class="span1">
-        <h6>Map</h6>
-    </div>
 </div>
-
 <div class="row-fluid">
     <div class="span11">
         <h4>Display Options</h4>
diff --git a/panels/map2/module.html b/panels/map2/module.html
index cb7551d3980..041da5ad6d2 100644
--- a/panels/map2/module.html
+++ b/panels/map2/module.html
@@ -19,7 +19,7 @@
         .hexagon {
             fill: none;
             stroke: #000;
-            stroke-width: .5px;
+            stroke-width: .1px;
         }
 
     </style>
diff --git a/panels/map2/module.js b/panels/map2/module.js
index 6754184a4a6..be7b0f7ff3e 100644
--- a/panels/map2/module.js
+++ b/panels/map2/module.js
@@ -239,15 +239,14 @@ angular.module('kibana.map2', [])
                                     .size([width, height])
                                     .radius(scope.panel.display.binning.hexagonSize);
 
+                                //bin and sort the points, so we can set the various ranges appropriately
                                 var binnedPoints = hexbin(points).sort(function(a, b) { return b.length - a.length; });
-                                console.log(binnedPoints);
-
 
                                 var radius = d3.scale.sqrt()
                                     .domain([0, binnedPoints[0].length])
                                     .range([0, scope.panel.display.binning.hexagonSize]);
 
-                                
+
                                 var color = d3.scale.linear()
                                     .domain([0,binnedPoints[0].length])
                                     .range(["white", "steelblue"])