diff --git a/css/app.css b/css/app.css
index 813005f7a..4da8eaa5f 100644
--- a/css/app.css
+++ b/css/app.css
@@ -614,6 +614,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
+    padding: 20px;
 }
 
 .header button,
@@ -625,9 +626,16 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .header button {
+    position: relative;
     height: 100%;
 }
 
+.preset-list-pane .header button {
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+
 .modal > button {
     position: absolute;
     right: 0;
@@ -671,51 +679,15 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .inspector-inner {
-    padding: 20px;
+    padding: 20px 20px 0 20px;
     position: relative;
 }
 
-.inspector-wrap .header button.preset-reset {
-    float: left;
+.inspector-inner:last-child,
+.inspector-inner:only-child {
+    padding-bottom: 20px;
 }
 
-.inspector-wrap .header button.preset-close {
-    float: right;
-}
-
-.inspector-wrap .header button.preset-reset > div {
-    height: 100%;
-    padding: 20px 0;
-}
-
-.inspector-wrap .header button.preset-reset .col12:last-child {
-    position: absolute;
-    width: 100%;
-    padding: 20px 0;
-    opacity: 0;
-}
-
-.inspector-wrap .header button:hover .col12:first-child {
-    opacity: 0;
-}
-
-.inspector-wrap .header button:hover .col12:last-child {
-    opacity: 1;
-}
-
-.inspector-wrap .header button.line > div {
-    padding: 0;
-}
-
-.inspector-toggle {
-    color:#fff;
-    width: 100%;
-    display: block;
-    background:#7092ff;
-    border: 0;
-}
-
-
 /* Presets
 ------------------------------------------------------- */
 
@@ -962,11 +934,11 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     border-radius: 0 0 4px 0;
 }
 
-.entity-editor-pane .inspector-external-links {
-    border-top: 1px solid #ccc;
+/* Preset form (hover mode) */
+.inspector-hover .header {
+    background-color: #f6f6f6;
 }
 
-/* Preset form (hover mode) */
 .inspector-hover textarea,
 .inspector-hover form,
 .inspector-hover input[type=text],
@@ -1043,8 +1015,8 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* adding additional preset fields */
 
-.more-buttons {
-    border-top: 1px solid #CCC;
+.inspector-body .more-buttons {
+    border-bottom: 1px solid #ccc;
 }
 
 button.preset-add-field {
@@ -1440,11 +1412,6 @@ div.combobox {
 
 /* Raw Tag Editor */
 
-.raw-tag-editor {
-    border-top: 1px solid #ccc;
-    padding-bottom: 0;
-}
-
 .tag-list {
     padding-top: 10px;
 }
@@ -1588,6 +1555,10 @@ img.wiki-image {
 
 /* Raw relation membership editor */
 
+.raw-member-editor .member-list {
+    padding-top: 10px;
+}
+
 .raw-membership-editor .member-row {
     position: relative;
     padding-top: 10px;
diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js
index 2d076ca91..397bb9799 100644
--- a/js/id/ui/entity_editor.js
+++ b/js/id/ui/entity_editor.js
@@ -17,17 +17,16 @@ iD.ui.EntityEditor = function(context) {
             .attr('class', 'header fillL cf');
 
         $enter.append('button')
-            .attr('class', 'preset-reset')
+            .attr('class', 'fl preset-reset')
             .append('span')
             .attr('class', 'icon back');
 
         $enter.append('button')
-            .attr('class', 'preset-close')
+            .attr('class', 'fr preset-close')
             .append('span')
             .attr('class', 'icon close');
 
-        $enter.append('h3')
-            .attr('class', 'inspector-inner');
+        $enter.append('h3');
 
         // Update
 
diff --git a/js/id/ui/preset_list.js b/js/id/ui/preset_list.js
index 09af52e9f..9b961c79a 100644
--- a/js/id/ui/preset_list.js
+++ b/js/id/ui/preset_list.js
@@ -14,7 +14,6 @@ iD.ui.PresetList = function(context) {
             .attr('class', 'header fillL cf');
 
         var message = messagewrap.append('h3')
-            .attr('class', 'inspector-inner')
             .text(t('inspector.choose'));
 
         if (preset) {