diff --git a/css/app.css b/css/app.css
index 610298ffd..f15116e2b 100644
--- a/css/app.css
+++ b/css/app.css
@@ -696,6 +696,7 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     width:100%;
     margin-top: 60px;
     padding: 20px 10px 10px 20px;
+    border-bottom: 1px solid #ccc;
 }
 .grid-button-wrap {
     padding: 0 10px 10px 0;
@@ -804,7 +805,6 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 .show-more {
     text-align: center;
     width: 100%;
-    border-top: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
     border-radius: 0;
 }
@@ -1126,6 +1126,11 @@ div.combobox {
 
 /* tag editor */
 
+.inspector-inner.additional-tags {
+    border-bottom: 1px solid #ccc;
+    border-top: 1px solid #ccc;
+}
+
 .tag-list {
     margin-top: 10px;
 }
diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js
index 50fa40155..8a8e58013 100644
--- a/js/id/ui/preset_grid.js
+++ b/js/id/ui/preset_grid.js
@@ -33,7 +33,7 @@ iD.ui.PresetGrid = function(context, entity) {
         }
 
         var gridwrap = selection.append('div')
-            .attr('class', 'fillL inspector-body inspector-body-' + entity.geometry(context.graph()));
+            .attr('class', 'fillL2 inspector-body inspector-body-' + entity.geometry(context.graph()));
 
         var grid = gridwrap.append('div')
             .attr('class', 'preset-grid fillL cf')
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index eb3baf47c..9c6ed6edc 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -30,10 +30,7 @@ iD.ui.TagEditor = function(context, entity) {
             .attr('class', 'message fillL');
 
         messagewrap.append('button')
-            .attr('class', 'tooltip-bottom preset-reset fl')
-            .call(bootstrap.tooltip()
-                .title(t('inspector.back_tooltip'))
-                .placement('left'))
+            .attr('class', 'preset-reset fl')
             .on('click', function() {
                 event.choose(preset);
             })
@@ -45,13 +42,13 @@ iD.ui.TagEditor = function(context, entity) {
             .text(t('inspector.editing'));
 
         messagewrap.append('button')
-            .attr('class', 'tooltip-bottom preset-close fr')
+            .attr('class', 'preset-close fr')
             .on('click', event.close)
             .append('span')
             .attr('class', 'icon close');
 
         var editorwrap = selection.append('div')
-            .attr('class', 'tag-wrap inspector-body fillL inspector-body-' + entity.geometry(context.graph()));
+            .attr('class', 'tag-wrap inspector-body fillL2 inspector-body-' + entity.geometry(context.graph()));
 
         var headerwrap = editorwrap.append('div').attr('class','col12 head');
 
@@ -101,7 +98,7 @@ iD.ui.TagEditor = function(context, entity) {
         }
 
         editorwrap.append('div')
-            .attr('class','inspector-inner col12 fillL2')
+            .attr('class','inspector-inner col12 fillL additional-tags')
             .call(tagList, preset.id === 'other');
 
         // Don't add for created entities