diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index c02ad9421..7c6cdab40 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -44,15 +44,7 @@ page_headings = {
 def choose_template(service_id):
     return render_template(
         'views/templates/choose.html',
-        templates=[
-            get_template(
-                template,
-                current_service,
-                letter_preview_url=url_for('.view_template', service_id=service_id, template_id=template['id']),
-            )
-            for template in service_api_client.get_service_templates(service_id)['data']
-            if should_show_template(template['template_type'])
-        ],
+        templates=service_api_client.get_service_templates(service_id)['data']
     )
 
 
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index b20ab05fd..19bbe6ff5 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -1,3 +1,5 @@
+{% from "components/message-count-label.html" import message_count_label %}
+
 {% extends "withnav_template.html" %}
 
 {% block service_page_title %}
@@ -44,19 +46,22 @@
       {% endif %}
     </div>
 
-    <div class="grid-row">
+    <nav class="grid-row">
       {% for template in templates %}
         <div class="column-whole">
-          <h2 class="message-name">{{ template.name }}</h2>
-          {% if template.get_raw('updated_at', None) %}
-            <p class="message-updated-at">
-              Edited {{ template.get_raw('updated_at', None)|format_date_short }}&ensp;<a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">see previous versions</a>
-            </p>
-          {% endif %}
+          <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">
+            {{ 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>
-        {% include 'views/templates/_template.html' %}
       {% endfor %}
-    </div>
+    </nav>
   {% endif %}
 
 {% endblock %}
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 70076b152..c08730192 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -664,132 +664,6 @@ def test_route_invalid_permissions(
         service_one)
 
 
-def test_route_choose_template_manage_service_permissions(
-    mocker,
-    app_,
-    client,
-    api_user_active,
-    service_one,
-    mock_login,
-    mock_get_user,
-    mock_get_service,
-    mock_check_verify_code,
-    mock_get_service_templates,
-    mock_get_jobs,
-):
-    template_id = mock_get_service_templates(service_one['id'])['data'][0]['id']
-    resp = validate_route_permission(
-        mocker,
-        app_,
-        "GET",
-        200,
-        url_for(
-            'main.choose_template',
-            service_id=service_one['id'],
-        ),
-        ['manage_users', 'manage_templates', 'manage_settings'],
-        api_user_active,
-        service_one)
-    page = resp.get_data(as_text=True)
-    assert url_for(
-        "main.send_messages",
-        service_id=service_one['id'],
-        template_id=template_id) not in page
-    assert url_for(
-        "main.send_test",
-        service_id=service_one['id'],
-        template_id=template_id) not in page
-    assert url_for(
-        "main.edit_service_template",
-        service_id=service_one['id'],
-        template_id=template_id) in page
-
-
-def test_route_choose_template_send_messages_permissions(
-    mocker,
-    app_,
-    client,
-    active_user_with_permissions,
-    service_one,
-    mock_get_service,
-    mock_check_verify_code,
-    mock_get_service_templates,
-    mock_get_jobs,
-):
-    template_id = None
-    for temp in mock_get_service_templates(service_one['id'])['data']:
-        if temp['template_type'] == 'sms':
-            template_id = temp['id']
-    assert template_id
-    resp = validate_route_permission(
-        mocker,
-        app_,
-        "GET",
-        200,
-        url_for(
-            'main.choose_template',
-            service_id=service_one['id'],
-            template_type='sms'),
-        ['send_texts', 'send_emails', 'send_letters'],
-        active_user_with_permissions,
-        service_one)
-    page = resp.get_data(as_text=True)
-    assert url_for(
-        "main.send_messages",
-        service_id=service_one['id'],
-        template_id=template_id) in page
-    assert url_for(
-        "main.edit_service_template",
-        service_id=service_one['id'],
-        template_id=template_id) not in page
-
-
-def test_route_choose_template_manage_api_keys_permissions(
-    mocker,
-    app_,
-    client,
-    api_user_active,
-    service_one,
-    mock_get_user,
-    mock_get_service,
-    mock_check_verify_code,
-    mock_get_service_templates,
-    mock_get_jobs,
-):
-    template_id = None
-    for temp in mock_get_service_templates(service_one['id'])['data']:
-        if temp['template_type'] == 'sms':
-            template_id = temp['id']
-    assert template_id
-    resp = validate_route_permission(
-        mocker,
-        app_,
-        "GET",
-        200,
-        url_for(
-            'main.choose_template',
-            service_id=service_one['id'],
-            template_type='sms'),
-        ['manage_api_keys'],
-        api_user_active,
-        service_one)
-    page = resp.get_data(as_text=True)
-    assert url_for(
-        "main.send_test",
-        service_id=service_one['id'],
-        template_id=template_id) not in page
-    assert url_for(
-        "main.edit_service_template",
-        service_id=service_one['id'],
-        template_id=template_id) not in page
-    page = BeautifulSoup(resp.data.decode('utf-8'), 'html.parser')
-    links = page.findAll('a', href=re.compile('^' + url_for(
-        "main.send_from_api",
-        service_id=service_one['id'],
-        template_id=template_id)))
-    assert len(links) == 1
-
-
 @pytest.mark.parametrize(
     'extra_args,expected_url',
     [