diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index 8e59bede1..afd38dc71 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -39,6 +39,11 @@
   margin-bottom: $gutter-half;
 }
 
+.bottom-gutter-1-3 {
+  @extend %bottom-gutter;
+  margin-bottom: $gutter/3;
+}
+
 .bottom-gutter-3-2 {
   @extend %bottom-gutter;
   margin-bottom: $gutter * 3/2;
diff --git a/app/templates/views/templates/_template_history.html b/app/templates/views/templates/_template_history.html
index ddf5ed391..853a3b059 100644
--- a/app/templates/views/templates/_template_history.html
+++ b/app/templates/views/templates/_template_history.html
@@ -1,18 +1,16 @@
 <div class="column-whole">
   <h2 class="message-name">{{ template.name }}</h2>
+  <p class="hint">
+    {% if template.get_raw('version', 1) > 1 %}
+      Edit made {% if template.get_raw('updated_at', None) %}{{ template.get_raw('updated_at')|format_datetime_normal }}{% endif %}
+    {% else %}
+      Created
+      {% if template.get_raw('created_at', None) %}{{ template.get_raw('created_at')|format_datetime_normal }}{% endif %}
+    {% endif %}
+    by {{ template.get_raw('created_by').name }}
+  </p>
 </div>
 
-<div class="column-two-thirds">
+<div class="column-whole">
   {{ template|string }}
 </div>
-
-<div class="column-one-third">
-  <div class="message-use-links">
-    {% if template.get_raw('version', 1) > 1 %}
-      {% if template.get_raw('updated_at', None) %}{{ template.get_raw('updated_at')|format_datetime_normal }}{% endif %}
-    {% else %}
-      Created<br/>{% if template.get_raw('created_at', None) %}{{ template.get_raw('created_at')|format_datetime_normal }}{% endif %}
-    {% endif %}
-    <br/>by {{ template.get_raw('created_by').name }}
-  </div>
-</div>
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index ad7381388..1d3590312 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -64,12 +64,8 @@
           <h2 class="message-name">
             <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=template.id) }}">{{ template.name }}</a>
           </h2>
-          <p class="hint bottom-gutter-1-2">
+          <p class="hint bottom-gutter-1-3">
             {{ message_count_label(1, template.template_type, suffix='')|capitalize }} template
-            {% if template.get('updated_at', None) %}
-              &emsp;Last edited {{ template.get('updated_at', None)|format_date_short }}
-              &emsp;<a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a>
-            {% endif %}
           </p>
         </div>
       {% endfor %}
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index 08f9c185d..f18226a98 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -18,8 +18,17 @@
     {% endwith %}
   </div>
 
-  <div class="bottom-gutter-2">
+  <div class="bottom-gutter">
     {{ api_key(template.id, name="Template ID", thing='template ID') }}
   </div>
 
+  {% if template._template.updated_at %}
+    <div class="bottom-gutter-2">
+      <h2 class="heading-small">Last edited {{ template._template.updated_at|format_datetime_relative }}</h2>
+      <p>
+        <a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a>
+      </p>
+    </div>
+  {% endif %}
+
 {% endblock %}