diff --git a/addressfield/templates/addressfield/widgets/nested_with_label.html b/addressfield/templates/addressfield/widgets/nested_with_label.html
index 82afcdc8acd46ecb4a3126dd64d196d6a4eb23d7..afb74baf2e6a247ab3fc5ed3f75e80e000ffa6ad 100644
--- a/addressfield/templates/addressfield/widgets/nested_with_label.html
+++ b/addressfield/templates/addressfield/widgets/nested_with_label.html
@@ -1,8 +1,8 @@
 <div {% include "django/forms/widgets/attrs.html" %}>{% spaceless %}
     {% for widget in widget.subwidgets %}
         {% if not widget.subwidgets %}
-        <div class="form__item">
-            <label for="{{ widget.attrs.id }}">{{ widget.attrs.display }}</label>
+        <div class="form__group">
+            <label class="form__question" for="{{ widget.attrs.id }}">{{ widget.attrs.display }}</label>
         {% endif %}
 
         {% include widget.template_name %}
diff --git a/opentech/static_src/src/sass/components/_form.scss b/opentech/static_src/src/sass/components/_form.scss
index 934f5b64f6242ebad4dffeece0dc52b5fa33f514..97055ae9399efce911664ba6e829096037799fea 100644
--- a/opentech/static_src/src/sass/components/_form.scss
+++ b/opentech/static_src/src/sass/components/_form.scss
@@ -19,6 +19,13 @@
         input[type='date']:last-child {
             max-width: 385px;
         }
+
+        &:last-child {
+            .locality & {
+                // remove margin from last item in address field set
+                margin-bottom: 0;
+            }
+        }
     }
 
     &__question {
@@ -81,10 +88,11 @@
         select {
             background: transparent;
             border-radius: 0;
-            appearance: none; // sass-lint:disable-line
+            appearance: none;
+            -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefixes
+            -moz-appearance: none; // sass-lint:disable-line no-vendor-prefixes
 
             option {
-
                 background-color: white;
             }
         }