diff --git a/app/assets/stylesheets/components/browse-list.scss b/app/assets/stylesheets/components/browse-list.scss
index 26781ad65..14f7b59f8 100644
--- a/app/assets/stylesheets/components/browse-list.scss
+++ b/app/assets/stylesheets/components/browse-list.scss
@@ -1,18 +1,24 @@
 .browse-list {
+  margin-bottom: $gutter-half;
 
-  margin-bottom: $gutter;
+  .browse-sub-list {
+    margin-top: $gutter-half;
+    margin-left: $gutter;
+    @include media('desktop') {
+      margin-left: $gutter * 2;
+    }
+  }
 
-  &-item {
+  &-item,
+  &-sub-item {
     list-style: none;
-    margin-bottom: $gutter-two-thirds;
+    margin-bottom: $gutter-half;
   }
 
   &-link {
-
     @include bold-24;
 
     &-destructive {
-
       @include bold-24;
       color: $error-colour;
 
@@ -25,14 +31,11 @@
       &:hover {
         color: $mellow-red;
       }
-
     }
-
   }
 
   &-hint {
     @include core-19;
     margin-top: 5px;
   }
-
 }
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index 6fd63733e..e4f812935 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -9,45 +9,33 @@
   <h1 class="heading-large">
     Choose account
   </h1>
-
-  {% for org in organisations %}
-    <div class="keyline-block">&nbsp;</div>
-    <div>
-      <nav>
-        <div class="browse-list-item">
+  <nav class="browse-list">
+    <ul>
+      {% for org in organisations %}
+        <li class="browse-list-item">
           <a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
-        </div>
-        <div style="margin-left: 30px" class="browse-list">
-          <ul>
-            {% for item in org.services %}
-              <li class="browse-list-item">
-                <a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
-              </li>
-            {% endfor %}
-          </ul>
-        </div>
-      </nav>
-    </div>
-  {% endfor %}
-  {% if services_without_organisations %}
-    <div class="keyline-block">&nbsp;</div>
-    <nav class="browse-list">
-      <ul>
+          {% if org.services %}
+            <ul class="browse-sub-list">
+              {% for item in org.services %}
+                <li class="browse-list-sub-item">
+                  <a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
+                </li>
+              {% endfor %}
+            </ul>
+          {% endif %}
+        </li>
+        <div class ="keyline-block"></div>
+      {% endfor %}
+      {% if services_without_organisations %}
         {% for item in services_without_organisations %}
           <li class="browse-list-item">
             <a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
           </li>
         {% endfor %}
-      </ul>
-    </nav>
-  {% endif %}
+        <div class ="keyline-block"></div>
+      {% endif %}
   {% if can_add_service %}
-    <div class="keyline-block">&nbsp;</div>
-    <nav class="browse-list">
-      <div class="browse-list-item">
-          <a href="{{ url_for('.add_service') }}" class="browse-list-link">Add a new service…</a>
-      </div>
-    </nav>
+    <a href="{{ url_for('.add_service') }}" class="browse-list-link">Add a new service…</a>
   {% endif %}
 
 {% endblock %}