diff --git a/css/app.css b/css/app.css
index b16cfe7cc..359f3b25e 100644
--- a/css/app.css
+++ b/css/app.css
@@ -28,6 +28,14 @@ h3 {
     line-height:30px;
 }
 
+h4 {
+    font-size: 12px;
+    font-weight: normal;
+    font-style: italic;
+    line-height: 20px;
+    padding-bottom: 10px;
+}
+
 :focus {
     outline-color: transparent;
     outline-style: none;
@@ -56,17 +64,14 @@ a:hover {
 
 input[type=text] {
     background-color: white;
-    width:150px;
-    line-height:20px;
-    height:20px;
+    height:30px;
     border:1px solid #ccc;
-    padding: 5px;
+    padding:4px 10px;
     margin:0;
-    box-shadow: inset 0 0 3px 0 rgba(0,0,0,.25);;
 }
 
 input[type=text]:focus {
-    border-color:#aaa;
+    background-color: #ececec;
 }
 
 /* tables */
@@ -174,7 +179,7 @@ button.Browse {
 button.minor {
     height: 20px;
     width: 20px;
-    margin: 0;
+    margin: 5px;
 }
 
 .buttons-joined {
@@ -362,6 +367,10 @@ button.Browse .label {
     padding: 10px;
 }
 
+.inspector-inner.head {
+    border-bottom: 1px solid #ccc;
+}
+
 .inspector-inner button {
     position: absolute;
     top: 0;
@@ -390,26 +399,30 @@ button.Browse .label {
 }
 
 .input-wrap {
-    position: absolute;
-    left: 0px;
-    right: 80px;
+    position: relative;
+    margin-top: -1px;
     }
 
 .tag-row input {
     width: 50%;
-    margin:0;
-    height: 30px;
-    padding:4px;
-    border:1px solid #ccc;
     border-right: 0;
-    border-top: 0;
-    background:#fff;
 }
 
+.tag-row input.key {
+    font-weight: bold;
+}
+
+.tag-row:first-child input {
+    border-top: 1px solid #ccc;
+}
 .tag-row input.value {
     border-right: 1px solid #ccc;
 }
 
+.inspector-buttons {
+    border-top: 1px solid #ccc;
+}
+
 /* Map Controls */
 
 .map-control {
@@ -454,7 +467,7 @@ button.Browse .label {
 }
 
 .opacity-options-wrapper {
-    padding: 10px;
+    padding: 10px 10px 0 10px;
 }
 
 .opacity-options {
@@ -462,7 +475,9 @@ button.Browse .label {
     background: url(../img/background-pattern-opacity.png) 0 0 repeat;
     height:20px;
     width:62px;
-    float: right;
+    position: absolute;
+    right: 10px;
+    top: 10px;
 }
 
 .opacity-options li {
@@ -568,17 +583,30 @@ img.tile {
     margin-left:10px;
 }
 
+/* typeahead dropdowns
+------------------------------------------------------- */
+
 div.typeahead {
-    background:#fff;
-    width:148px;
-    border:1px solid #ccc;
+    width:200px;
+    z-index: 9999;
+    box-shadow: 0 5px 10px 0 rgba(0,0,0,.2);
+    margin-top: -1px;
 }
 
 div.typeahead a {
+    height: 30px;
+    border:1px solid #ccc;
+    border-top: 0;
+    background-color: #fff;
     padding:1px 4px;
     display:block;
 }
 
+div.typeahead a:first-child {
+    border-top: 1px solid #ccc;
+}
+
+
 /* Modals
 ------------------------------------------------------- */
 
diff --git a/img/source/design.svg b/img/source/design.svg
index 401817c2d..8206480f0 100644
--- a/img/source/design.svg
+++ b/img/source/design.svg
@@ -391,10 +391,10 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="245.71977"
-     inkscape:cy="806.33291"
+     inkscape:cx="890.32523"
+     inkscape:cy="742.11499"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer13"
      showgrid="false"
      inkscape:window-width="1543"
      inkscape:window-height="834"
@@ -538,7 +538,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -589,7 +589,7 @@
        id="g48109-9">
       <path
          transform="matrix(1.3812956,0,0,1.3812956,-281.33115,-136.73404)"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          sodipodi:ry="4.34375"
          sodipodi:rx="4.34375"
          sodipodi:cy="348.03125"
@@ -605,7 +605,7 @@
          sodipodi:cy="348.03125"
          sodipodi:rx="4.34375"
          sodipodi:ry="4.34375"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          transform="matrix(0.92086961,0,0,0.92086961,-134.55593,23.508627)" />
     </g>
     <path
@@ -872,7 +872,7 @@
        sodipodi:cy="55"
        sodipodi:rx="5"
        sodipodi:ry="5"
-       d="m 20,55 a 5,5 0 1 1 -10,0 5,5 0 1 1 10,0 z"
+       d="m 20,55 c 0,2.761424 -2.238576,5 -5,5 -2.761424,0 -5,-2.238576 -5,-5 0,-2.761424 2.238576,-5 5,-5 2.761424,0 5,2.238576 5,5 z"
        transform="matrix(1.6,0,0,1.6,-9,-270.63782)" />
     <text
        xml:space="preserve"
@@ -1540,7 +1540,7 @@
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       <path
          transform="matrix(0.6666757,0,0,0.6666757,289.99211,-35.665398)"
-         d="m 873,-140 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+         d="m 873,-140 c 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 1.65685,0 3,1.34315 3,3 z"
          sodipodi:ry="3"
          sodipodi:rx="3"
          sodipodi:cy="-140"
@@ -1880,7 +1880,7 @@
            sodipodi:cy="283"
            sodipodi:rx="3"
            sodipodi:ry="3"
-           d="m 1573,283 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+           d="m 1573,283 c 0,1.65685 -1.3431,3 -3,3 -1.6569,0 -3,-1.34315 -3,-3 0,-1.65685 1.3431,-3 3,-3 1.6569,0 3,1.34315 3,3 z"
            transform="matrix(2.1666667,0,0,2.1666667,-1611.6667,-277.80448)" />
         <path
            inkscape:connector-curvature="0"
@@ -1938,11 +1938,11 @@
            sodipodi:cy="276.25"
            sodipodi:rx="1.2499993"
            sodipodi:ry="1.2499993"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            transform="matrix(0.79999994,0,0,0.80000183,533.8001,107.36168)" />
         <path
            transform="matrix(0.79999994,0,0,0.80000183,533.80009,107.36168)"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            sodipodi:ry="1.2499993"
            sodipodi:rx="1.2499993"
            sodipodi:cy="276.25"
@@ -1958,7 +1958,7 @@
            sodipodi:cy="276.25"
            sodipodi:rx="1.2499993"
            sodipodi:ry="1.2499993"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            transform="matrix(0.79999994,0,0,0.80000183,533.80009,121.36168)" />
         <path
            sodipodi:type="arc"
@@ -1968,11 +1968,11 @@
            sodipodi:cy="276.25"
            sodipodi:rx="1.2499993"
            sodipodi:ry="1.2499993"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            transform="matrix(0.56568538,0.56568538,-0.56568672,0.56568672,1063.0035,-714.17624)" />
         <path
            transform="matrix(0.56568538,0.56568538,-0.56568672,0.56568672,1053.0035,-704.17624)"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            sodipodi:ry="1.2499993"
            sodipodi:rx="1.2499993"
            sodipodi:cy="276.25"
@@ -1982,7 +1982,7 @@
            sodipodi:type="arc" />
         <path
            transform="matrix(0,0.79999994,-0.80000183,0,2018.0005,-920.83771)"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            sodipodi:ry="1.2499993"
            sodipodi:rx="1.2499993"
            sodipodi:cy="276.25"
@@ -1998,7 +1998,7 @@
            sodipodi:cy="276.25"
            sodipodi:rx="1.2499993"
            sodipodi:ry="1.2499993"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            transform="matrix(0,0.79999994,-0.80000183,0,2004.0005,-920.83772)" />
         <path
            sodipodi:type="arc"
@@ -2008,11 +2008,11 @@
            sodipodi:cy="276.25"
            sodipodi:rx="1.2499993"
            sodipodi:ry="1.2499993"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            transform="matrix(-0.56568538,0.56568538,-0.56568672,-0.56568672,2839.5384,-391.63433)" />
         <path
            transform="matrix(-0.56568538,0.56568538,-0.56568672,-0.56568672,2829.5384,-401.63433)"
-           d="m 1571.5,276.25 a 1.2499993,1.2499993 0 1 1 -2.5,0 1.2499993,1.2499993 0 1 1 2.5,0 z"
+           d="m 1571.5,276.25 c 0,0.69036 -0.5596,1.25 -1.25,1.25 -0.6904,0 -1.25,-0.55964 -1.25,-1.25 0,-0.69036 0.5596,-1.25 1.25,-1.25 0.6904,0 1.25,0.55964 1.25,1.25 z"
            sodipodi:ry="1.2499993"
            sodipodi:rx="1.2499993"
            sodipodi:cy="276.25"
@@ -2171,7 +2171,7 @@
        inkscape:export-ydpi="90">
       <path
          transform="matrix(1.7266148,0,0,1.7266148,-391.91245,-256.41592)"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          sodipodi:ry="4.34375"
          sodipodi:rx="4.34375"
          sodipodi:cy="348.03125"
@@ -2187,12 +2187,12 @@
          sodipodi:cy="348.03125"
          sodipodi:rx="4.34375"
          sodipodi:ry="4.34375"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          transform="matrix(1.2661754,0,0,1.2661754,-245.13293,-96.168573)" />
     </g>
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-762.74873,12.311224)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2208,7 +2208,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-615.97053,172.55711)" />
     <g
        id="g48361"
@@ -2293,11 +2293,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-762.74873,76.311224)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-615.97053,236.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2307,7 +2307,7 @@
        sodipodi:type="arc" />
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-794.74873,44.311224)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2323,7 +2323,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-647.97053,204.55711)" />
     <path
        sodipodi:type="arc"
@@ -2333,11 +2333,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-730.74873,44.311224)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-583.97053,204.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2385,11 +2385,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-642.74873,12.31122)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-495.97053,172.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2474,7 +2474,7 @@
     </g>
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-642.74873,76.31122)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2490,7 +2490,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-495.97053,236.55711)" />
     <path
        sodipodi:type="arc"
@@ -2500,11 +2500,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-674.74873,44.31122)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-527.97053,204.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2514,7 +2514,7 @@
        sodipodi:type="arc" />
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-610.74873,44.31122)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2530,7 +2530,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-463.97053,204.55711)" />
     <rect
        y="372.86221"
@@ -2573,7 +2573,7 @@
     </g>
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-527.74873,12.31122)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2589,7 +2589,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-380.97053,172.55711)" />
     <g
        id="g48559"
@@ -2674,11 +2674,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-527.74873,76.31122)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-380.97053,236.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2688,7 +2688,7 @@
        sodipodi:type="arc" />
     <path
        transform="matrix(1.0359729,0,0,1.0359729,-559.74873,44.31122)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2704,7 +2704,7 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(0.57553759,0,0,0.57553759,-412.97053,204.55711)" />
     <path
        sodipodi:type="arc"
@@ -2714,11 +2714,11 @@
        sodipodi:cy="348.03125"
        sodipodi:rx="4.34375"
        sodipodi:ry="4.34375"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        transform="matrix(1.0359729,0,0,1.0359729,-495.74873,44.31122)" />
     <path
        transform="matrix(0.57553759,0,0,0.57553759,-348.97053,204.55711)"
-       d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+       d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
        sodipodi:ry="4.34375"
        sodipodi:rx="4.34375"
        sodipodi:cy="348.03125"
@@ -2824,7 +2824,7 @@
        transform="translate(-558.99999,-1.637819)">
       <path
          transform="matrix(1.7266056,0,0,1.7266056,-391.90946,-256.41269)"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          sodipodi:ry="4.34375"
          sodipodi:rx="4.34375"
          sodipodi:cy="348.03125"
@@ -2834,7 +2834,7 @@
          sodipodi:type="arc" />
       <path
          transform="matrix(1.3812793,0,0,1.3812793,-281.82588,-136.22832)"
-         d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z"
+         d="m 323.125,348.03125 c 0,2.39899 -1.94476,4.34375 -4.34375,4.34375 -2.39899,0 -4.34375,-1.94476 -4.34375,-4.34375 0,-2.39899 1.94476,-4.34375 4.34375,-4.34375 2.39899,0 4.34375,1.94476 4.34375,4.34375 z"
          sodipodi:ry="4.34375"
          sodipodi:rx="4.34375"
          sodipodi:cy="348.03125"
@@ -3530,7 +3530,7 @@
      inkscape:groupmode="layer"
      id="layer13"
      inkscape:label="inspector"
-     style="display:none">
+     style="display:inline">
     <rect
        y="220.5"
        x="585.50006"
@@ -4476,6 +4476,15 @@
          id="g43223-00"
          transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
     </g>
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:115;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect54158"
+       width="10"
+       height="30"
+       x="590"
+       y="190"
+       rx="0"
+       ry="0" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 39a03ca58..c6faf69ba 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -61,6 +61,8 @@ iD.Inspector = function() {
             var inspectorwrap = selection
                 .append('ul').attr('class', 'inspector-inner tag-wrap fillL2')
 
+            inspectorwrap.append('h4').text('Edit tags')
+
             inspectorwrap
                 .data(['tag', 'value', ''])
                 .enter()
@@ -73,6 +75,7 @@ iD.Inspector = function() {
                 var inputs = row.append('div').attr('class','input-wrap').selectAll('input')
                     .data(function(d) { return [d, d]; });
                 inputs.enter().append('input')
+                    .property('type', 'text')
                     .attr('class', function(d, i) {
                         return i ? 'value' : 'key';
                     })
@@ -133,7 +136,7 @@ iD.Inspector = function() {
             selection.select('input').node().focus();
 
             selection.append('div')
-                .attr('class', 'buttons').call(drawbuttons);
+                .attr('class', 'inspector-buttons').call(drawbuttons);
 
             function drawbuttons(selection) {
                 selection.append('button')
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index bf26f0163..e5f1a8b32 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -49,8 +49,10 @@ iD.layerswitcher = function(map) {
         var opa = content
             .append('div')
             .attr('class', 'opacity-options-wrapper fillL2')
-            .html("<em>Layers</em>")
-            .append('ul')
+
+            opa.append('h4').text('Layers')
+
+            opa.append('ul')
                 .attr('class', 'opacity-options')
                 .selectAll('div.opacity')
                 .data(opacities)
@@ -76,6 +78,7 @@ iD.layerswitcher = function(map) {
                         .style('opacity', function(d) {
                             return d;
                         });
+
         // Make sure there is an active selection by default
         d3.select('.opacity-options li').classed('selected', true);