diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 37de83af6..db9f6a0a5 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -2,7 +2,7 @@
 
   &-name {
     @include bold-24;
-    margin: 20px 0 5px 0;
+    margin: 0;
 
     a {
       display: block;
@@ -14,8 +14,12 @@
 
   &-type {
     color: $secondary-text-colour;
-    margin-bottom: $gutter / 3;
+    margin: 0 0 $gutter-two-thirds 0;
     pointer-events: none;
   }
 
 }
+
+#template-list {
+  margin-top: $gutter;
+}
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 361dcb638..e69ac226a 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -51,7 +51,7 @@
     </div>
 
     {% if show_template_nav %}
-      <div class="bottom-gutter-2-3">
+      <div class="bottom-gutter">
         {{ pill(template_nav_items, current_value=template_type, show_count=False) }}
       </div>
     {% endif %}