diff --git a/css/app.css b/css/app.css
index 57a0ff512..0df284ac5 100644
--- a/css/app.css
+++ b/css/app.css
@@ -169,6 +169,13 @@ input.major {
     height:40px;
 }
 
+/* weird selector that hides bottom border radius when combox is open */
+.combobox + div textarea:focus,
+.combobox + div input:focus {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
 /* tables */
 
 table {
@@ -564,17 +571,18 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 
 .inspector-body {
     overflow: auto;
-    max-height: 440px;
+    max-height: 480px;
 }
 
 .inspector-inner {
-    padding: 10px;
-    border-bottom: 1px solid #ddd;
+    padding: 20px;
+    border-bottom: 1px solid #ccc;
     position: relative;
 }
 
 .inspector-inner.message {
     height: 60px;
+    padding: 10px;
 }
 
 .inspector-inner.message h3 {
@@ -598,19 +606,13 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }
 
 .inspector-body .type button {
-    height: 70px;
+    height: 125px;
 }
 
-.inspector-body-line .type button {
-    height: 100px;
+.inspector-body .name {
+    height: 125px;
 }
 
-.inspector-body .head .name {
-    padding-left: 10px;
-}
-
-.preset-input { padding-left: 10px;}
-
 .preset-grid-search-wrap {
     height: 60px;
 }
@@ -644,10 +646,19 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }
 
 .preset-label {
-    padding: 5px;
+    padding: 25px 20px 20px 20px;
+    position: absolute;
+    height: 100%;
+    left: 0px;
+    top: 0;
+    border-right: 1px solid #CCC;
     text-align: right;
 }
 
+.preset-input {
+    margin-left: 25%;
+    padding-left: 10px;
+}
 .preset-fav button.fav {
     height: 30px;
     margin: 5px;
@@ -723,7 +734,6 @@ div.combobox {
     text-align: center;
 }
 
-
 .checkselect label {
     display: block;
     padding: 5px;
@@ -877,17 +887,13 @@ div.combobox {
 /* Preset grid */
 
 .grid-entry {
-    height: 80px;
+    height: 120px;
     position: relative;
     border-right: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
     border-radius: 0;
 }
 
-.inspector-body-line .grid-entry {
-    min-height: 120px;
-}
-
 .grid-inner {
     margin-bottom: 20px;
 }
@@ -916,17 +922,13 @@ div.combobox {
 .grid-entry .preset-icon-fill.area {
     position: absolute;
     opacity: 0.4;
-    left: 0; right: 0; top: 20%;
-    border-radius: 4px;
-    margin: auto;
-    margin-top: -8px;
-    width: 40px;
-    height: 40px;
+    left: 0; right: 0; top: 0; bottom: 0;
+    pointer-events: none;
 }
 
 .grid-entry > .icon {
     position: absolute;
-    top: 20%;left: 0; right: 0;
+    top: 40px;left: 0; right: 0;
     margin: auto;
 }
 
@@ -1132,7 +1134,7 @@ div.combobox {
     position: absolute;
     right: 10px;
     top: 10px;
-    border: 1px solid #ddd;
+    border: 1px solid #ccc;
 }
 
 .opacity-options li {
@@ -1183,7 +1185,7 @@ div.combobox {
 
 .geocode-control div.content {
     z-index: 100;
-    top: 190px;
+    top: 200px;
     max-height: 300px;
     overflow-y: auto;
 }
diff --git a/data/presets/forms/access.json b/data/presets/forms/access.json
index 4d880a5c9..b16348cb1 100644
--- a/data/presets/forms/access.json
+++ b/data/presets/forms/access.json
@@ -1,4 +1,4 @@
 {
-    "key": "access",
+    "key": "Access",
     "type": "combo"
 }
\ No newline at end of file
diff --git a/data/presets/forms/building.json b/data/presets/forms/building.json
index 87257d332..82c7ebf17 100644
--- a/data/presets/forms/building.json
+++ b/data/presets/forms/building.json
@@ -1,4 +1,4 @@
 {
-    "key": "building",
+    "key": "Building",
     "type": "combo"
 }
\ No newline at end of file
diff --git a/data/presets/forms/fee.json b/data/presets/forms/fee.json
index d2ef7da4a..42e4dc693 100644
--- a/data/presets/forms/fee.json
+++ b/data/presets/forms/fee.json
@@ -1,4 +1,4 @@
 {
-    "key": "fee",
+    "key": "Fee",
     "type": "check"
 }
\ No newline at end of file
diff --git a/data/presets/forms/roadtype.json b/data/presets/forms/roadtype.json
index 4d8583857..daf4dd6e7 100644
--- a/data/presets/forms/roadtype.json
+++ b/data/presets/forms/roadtype.json
@@ -1,5 +1,5 @@
 {
-    "title": " ",
+    "key": "type",
     "type": "radio",
     "options": [
         "bridge",
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index b72b36f23..f3238334a 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -99,7 +99,7 @@ iD.ui.Geocoder = function(context) {
 
         var gcForm = selection.append('form');
 
-        var inputNode = gcForm.attr('class', 'content fillD map-overlay hide')
+        var inputNode = gcForm.attr('class', 'content fillL map-overlay hide')
             .append('input')
             .attr({ type: 'text', placeholder: t('geocoder.placeholder') })
             .attr('tabindex', 1)
diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index d866f359e..985a77353 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -39,7 +39,7 @@ iD.ui.preset = function(context) {
 
            wrap.append('div')
                 .attr('class', 'col3 preset-label')
-                .append('label')
+                .append('h4')
                 .attr('for', 'input-' + d.key)
                 .text(d.title || d.key);
 
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 375171930..6ed106db3 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -40,13 +40,13 @@ iD.ui.TagEditor = function(context) {
         var editorwrap = selection.append('div')
             .attr('class', 'tag-wrap inspector-body inspector-body-' + entity.geometry(context.graph()));
 
-        var headerwrap = editorwrap.append('div').attr('class','col12 inspector-inner head');
+        var headerwrap = editorwrap.append('div').attr('class','col12 head');
 
         var typewrap = headerwrap.append('div')
             .attr('class','col3 type');
 
         var typebutton = typewrap.append('button')
-            .attr('class','col12')
+            .attr('class','col12 grid-entry')
             .on('click', function() {
                 event.choose();
             });
@@ -57,10 +57,10 @@ iD.ui.TagEditor = function(context) {
         typebutton.node().focus();
 
          var namewrap = headerwrap.append('div')
-             .attr('class', 'name col9');
+             .attr('class', 'name preset-section inspector-inner col9');
 
         typebutton.append('span')
-            .attr('class','label')
+            .attr('class','h4')
             .text(preset.name);
 
         namewrap.append('h4').text(t('inspector.name'));
diff --git a/locale/en.js b/locale/en.js
index 3737f3e8c..ad3296a01 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -166,7 +166,7 @@ locale.en = {
 
     geocoder: {
         title: "Find A Place",
-        placeholder: "find a place",
+        placeholder: "Find a place",
         no_results: "Couldn't locate a place named '{name}'"
     },