diff --git a/app/templates/views/providers.html b/app/templates/views/providers.html
deleted file mode 100644
index 377c99e3e..000000000
--- a/app/templates/views/providers.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
-
-{% block per_page_title %}
-Providers
-{% endblock %}
-
-{% block maincolumn_content %}
-
-
-
-
Providers
-
- SMS
-
- {% call(item, row_number) list_table(
- sms_providers,
- caption="SMS providers",
- caption_visible=False,
- empty_message='No email providers',
- field_headings=['Provider', 'Priority', 'Active', 'Last Updated', ''],
- field_headings_visible=True
- ) %}
-
- {{ text_field(item.display_name) }}
-
- {{ text_field(item.priority) }}
-
- {{ text_field(item.active) }}
-
- {% if item.updated_at %}
- {{ text_field(item.updated_at|format_datetime_short) }}
- {% else %}
- {{ text_field('None') }}
- {% endif %}
-
- {{ link_field('change', url_for('main.view_provider', provider_id=item.id)) }}
-
-
- {% endcall %}
-
- Email
-
-
- {% call(item, row_number) list_table(
- email_providers,
- caption="Email providers",
- caption_visible=False,
- empty_message='No email providers',
- field_headings=['Provider', 'Priority', 'Active', ''],
- field_headings_visible=True
- ) %}
-
- {{ text_field(item.display_name) }}
-
- {{ text_field(item.priority) }}
-
- {{ text_field(item.active) }}
-
- {{ link_field('change', url_for('main.view_provider', provider_id=item.id)) }}
-
- {% endcall %}
-
-
-
-
-
-{% endblock %}
diff --git a/app/templates/views/provider.html b/app/templates/views/providers/edit-provider.html
similarity index 100%
rename from app/templates/views/provider.html
rename to app/templates/views/providers/edit-provider.html
diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html
new file mode 100644
index 000000000..22d7e61a4
--- /dev/null
+++ b/app/templates/views/providers/provider.html
@@ -0,0 +1,48 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+
+{% block per_page_title %}
+Provider versions
+{% endblock %}
+
+{% block maincolumn_content %}
+
+
+
+
{{ provider_versions[0].display_name }}
+
+ {% call(item, row_number) list_table(
+ provider_versions,
+ caption='',
+ caption_visible=False,
+ empty_message='No history for this provider',
+ field_headings=['Version', 'Last Updated', 'Updated By', 'Priority', 'Active'],
+ field_headings_visible=True
+ ) %}
+
+ {{ text_field(item.version) }}
+
+ {% if item.updated_at %}
+ {{ text_field(item.updated_at|format_datetime_short) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {% if item.created_by %}
+ {{ text_field(item.created_by.name) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {{ text_field(item.priority) }}
+
+ {{ text_field(item.active) }}
+
+ {% endcall %}
+
+
+
+
+
+
+{% endblock %}
diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html
new file mode 100644
index 000000000..f6529fc50
--- /dev/null
+++ b/app/templates/views/providers/providers.html
@@ -0,0 +1,84 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+{% from "components/show-more.html" import show_more %}
+
+{% block per_page_title %}
+Providers
+{% endblock %}
+
+{% block maincolumn_content %}
+
+
+
+
Providers
+
+ SMS
+
+ {% call(item, row_number) list_table(
+ sms_providers,
+ caption="SMS providers",
+ caption_visible=False,
+ empty_message='No email providers',
+ field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'],
+ field_headings_visible=True
+ ) %}
+
+ {{ link_field(item.display_name, url_for('main.view_provider', provider_id=item.id)) }}
+
+ {{ text_field(item.priority) }}
+
+ {{ text_field(item.active) }}
+
+ {% if item.updated_at %}
+ {{ text_field(item.updated_at|format_datetime_short) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {% if item.created_by %}
+ {{ text_field(item.created_by.name) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
+
+ {% endcall %}
+
+ Email
+
+ {% call(item, row_number) list_table(
+ email_providers,
+ caption="Email providers",
+ caption_visible=False,
+ empty_message='No email providers',
+ field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'],
+ field_headings_visible=True
+ ) %}
+
+ {{ link_field(item.display_name, url_for('main.view_provider', provider_id=item.id)) }}
+
+ {{ text_field(item.priority) }}
+
+ {{ text_field(item.active) }}
+
+ {% if item.updated_at %}
+ {{ text_field(item.updated_at|format_datetime_short) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {% if item.created_by %}
+ {{ text_field(item.created_by.name) }}
+ {% else %}
+ {{ text_field('None') }}
+ {% endif %}
+
+ {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
+
+ {% endcall %}
+
+
+
+
+{% endblock %}