diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index afd38dc71..c7becdee2 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -18,6 +18,10 @@
   @include grid-column(1/8);
 }
 
+.column-five-eighths {
+  @include grid-column(5/8);
+}
+
 .column-seven-eighths {
   @include grid-column(7/8);
 }
diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss
index 9b260cf9d..a5a79e6d6 100644
--- a/app/assets/stylesheets/components/sms-message.scss
+++ b/app/assets/stylesheets/components/sms-message.scss
@@ -2,7 +2,7 @@
 .sms-message-wrapper {
 
   width: 100%;
-  max-width: 450px;
+  max-width: 464px;
   box-sizing: border-box;
   padding: $gutter-half $gutter-half $gutter-half $gutter-half;
   background: $panel-colour;
diff --git a/app/assets/stylesheets/views/template.scss b/app/assets/stylesheets/views/template.scss
index 93ca1aea8..a059504e8 100644
--- a/app/assets/stylesheets/views/template.scss
+++ b/app/assets/stylesheets/views/template.scss
@@ -30,12 +30,12 @@
 
 .edit-template-link-letter-address {
   @extend %edit-template-link;
-  top: 16.5%; // align bottom edge to bottom of address
+  top: 14.65%; // align bottom edge to bottom of address
   left: -5px;
 }
 
 .edit-template-link-letter-body {
   @extend %edit-template-link;
-  top: 33.3%; // aligns to top of subject
+  top: 38.5%; // aligns to top of subject
   left: -5px;
 }
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index 33790e878..0319820a1 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -15,11 +15,9 @@
 
     <form method="post">
       <div class="grid-row">
-        <div class="column-three-quarters">
+        <div class="column-five-sixths">
           {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }}
           {{ textbox(form.subject, width='1-1', highlight_tags=True, rows=2) }}
-        </div>
-        <div class="column-three-quarters">
           {{ textbox(form.template_content, highlight_tags=True, width='1-1', rows=8) }}
           {% if current_user.has_permissions([], admin_override=True) %}
              {{ radios(form.process_type) }}
diff --git a/app/templates/views/edit-letter-template.html b/app/templates/views/edit-letter-template.html
index a44895432..5cb345e55 100644
--- a/app/templates/views/edit-letter-template.html
+++ b/app/templates/views/edit-letter-template.html
@@ -14,11 +14,9 @@
 
     <form method="post">
       <div class="grid-row">
-        <div class="column-three-quarters">
+        <div class="column-five-sixths">
           {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }}
           {{ textbox(form.subject, width='1-1', highlight_tags=True, rows=2) }}
-        </div>
-        <div class="column-three-quarters">
           {{ textbox(form.template_content, highlight_tags=True, width='1-1', rows=8) }}
           {{ page_footer(
             'Save',