diff --git a/css/80_app.css b/css/80_app.css
index f7c0e2235..218759dde 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -176,6 +176,7 @@ input[type=email] {
     height: 30px;
     border-radius: 4px;
     text-overflow: ellipsis;
+    overflow: hidden;
 }
 .ideditor[dir='rtl'] textarea,
 .ideditor[dir='rtl'] input[type=text],
@@ -902,7 +903,6 @@ a.hide-toggle {
     width: 100%;
 }
 .no-results-item,
-.geocode-item,
 .feature-list-item {
     width: 100%;
     position: relative;
@@ -911,11 +911,13 @@ a.hide-toggle {
 }
 
 .geocode-item {
-    width: 50%;
+    width: 100%;
+    max-width: 200px;
     background-color: #ccc;
-    left: 25%;
-    margin-top: 30px;
-    border-radius: 2px;
+    margin: 30px auto;
+    padding: 5px;
+    height: auto;
+    min-height: 40px;
 }
 
 .ideditor[dir='rtl'] .geocode-item {
@@ -2310,7 +2312,7 @@ div.combobox {
 
 .more-fields input {
     margin-left: 10px;
-    flex: 1 1 50%;
+    flex: 1 1 auto;
 }
 .ideditor[dir='rtl'] .more-fields input {
     margin-left: auto;
diff --git a/modules/ui/form_fields.js b/modules/ui/form_fields.js
index 5bbac52c2..035541afc 100644
--- a/modules/ui/form_fields.js
+++ b/modules/ui/form_fields.js
@@ -76,11 +76,16 @@ export function uiFormFields(context) {
         more.exit()
             .remove();
 
-        more = more.enter()
+        var moreEnter = more.enter()
             .append('div')
             .attr('class', 'more-fields')
-            .append('label')
-            .text(t('inspector.add_fields'))
+            .append('label');
+
+        moreEnter
+            .append('span')
+            .text(t('inspector.add_fields'));
+
+        more = moreEnter
             .merge(more);
 
 
diff --git a/modules/ui/sidebar.js b/modules/ui/sidebar.js
index c6b3a47c8..1690aaef2 100644
--- a/modules/ui/sidebar.js
+++ b/modules/ui/sidebar.js
@@ -38,7 +38,7 @@ export function uiSidebar(context) {
 
     function sidebar(selection) {
         var container = context.container();
-        var minWidth = 280;
+        var minWidth = 240;
         var sidebarWidth;
         var containerWidth;
         var dragOffset;