diff --git a/css/app.css b/css/app.css
index 9a066924f..a04c86587 100644
--- a/css/app.css
+++ b/css/app.css
@@ -559,12 +559,21 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 
 /* preset form */
 
+
 .inspector-body .name-help,
 .inspector-body .type-help {
   position: absolute;
   right: -10px;
 }
 
+.inspector-body.line .type button {
+    height: 100px;
+}
+
+.inspector-body .type button {
+    height: 70px;
+}
+
 .inspector-body .head .name {
     padding-left: 10px;
 }
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index cad838376..224ae7cfe 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -55,14 +55,12 @@ iD.ui.TagEditor = function(context) {
             .text(t('inspector.choose'));
 
         var editorwrap = selection.append('div')
-            .attr('class', 'tag-wrap inspector-body');
+            .attr('class', 'tag-wrap inspector-body ' + entity.geometry(context.graph()));
 
-        var headerwrap = editorwrap.append('div').attr('class','col12 head');
+        var headerwrap = editorwrap.append('div').attr('class','col12 inspector-inner head');
 
         var typewrap = headerwrap.append('div')
-            .attr('class','col3 type inspector-inner');
-
-        typewrap.append('h4').text('Type');
+            .attr('class','col3 type');
 
         var typebutton = typewrap.append('button')
             .attr('class','col12')
@@ -76,7 +74,7 @@ iD.ui.TagEditor = function(context) {
         typebutton.node().focus();
 
          var namewrap = headerwrap.append('div')
-             .attr('class', 'name col9 inspector-inner');
+             .attr('class', 'name col9');
 
         typebutton.append('span')
             .attr('class','label')