diff --git a/ogcp/static/css/soleta.css b/ogcp/static/css/soleta.css
index 730f54f..87e9e98 100644
--- a/ogcp/static/css/soleta.css
+++ b/ogcp/static/css/soleta.css
@@ -80,3 +80,10 @@ a.nav-link:not(.collapsed):not(.disabled)[data-toggle="collapse"]::before {
   transform: rotate(90deg);
   font-size: 0.7em;
 }
+
+.subhead-heading {
+  margin-top: 1.5rem;
+  margin-bottom: 1.5rem;
+  padding-bottom: 0.5rem;
+  border-bottom: 1px solid lightgray;
+}
diff --git a/ogcp/templates/actions/add_center.html b/ogcp/templates/actions/add_center.html
index 1822639..78886d6 100644
--- a/ogcp/templates/actions/add_center.html
+++ b/ogcp/templates/actions/add_center.html
@@ -8,7 +8,7 @@
 {% block nav_center_add %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add center')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add center')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_center_add'),
diff --git a/ogcp/templates/actions/add_room.html b/ogcp/templates/actions/add_room.html
index d71261d..5eedf4e 100644
--- a/ogcp/templates/actions/add_room.html
+++ b/ogcp/templates/actions/add_room.html
@@ -8,7 +8,7 @@
 {% block nav_room_add %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add room')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add room')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_room_add'),
diff --git a/ogcp/templates/actions/add_server.html b/ogcp/templates/actions/add_server.html
index c86dcba..6509ce4 100644
--- a/ogcp/templates/actions/add_server.html
+++ b/ogcp/templates/actions/add_server.html
@@ -7,7 +7,7 @@
 {% block nav_server_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add a server')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add a server')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('server_add_post'),
diff --git a/ogcp/templates/actions/cache.html b/ogcp/templates/actions/cache.html
index e6db31f..6443640 100644
--- a/ogcp/templates/actions/cache.html
+++ b/ogcp/templates/actions/cache.html
@@ -10,9 +10,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Manage Cache') }}
-</h1>
+</h2>
 
 <p>{{ _('Check free cache space in the client\'s bubbles:') }}</p>
 
diff --git a/ogcp/templates/actions/center_details.html b/ogcp/templates/actions/center_details.html
index 5f5d37a..6221de2 100644
--- a/ogcp/templates/actions/center_details.html
+++ b/ogcp/templates/actions/center_details.html
@@ -8,7 +8,7 @@
 {% block nav_center_details %} active {% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Center details')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Center details')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/center_update.html b/ogcp/templates/actions/center_update.html
index e93ac14..e866fac 100644
--- a/ogcp/templates/actions/center_update.html
+++ b/ogcp/templates/actions/center_update.html
@@ -8,7 +8,7 @@
 {% block nav_folder_update %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Update center')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Update center')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/client_add.html b/ogcp/templates/actions/client_add.html
index b1c37a5..d24c138 100644
--- a/ogcp/templates/actions/client_add.html
+++ b/ogcp/templates/actions/client_add.html
@@ -9,7 +9,7 @@
 {% block nav_client_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add client')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add client')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/client_details.html b/ogcp/templates/actions/client_details.html
index 42b03c7..b7d0615 100644
--- a/ogcp/templates/actions/client_details.html
+++ b/ogcp/templates/actions/client_details.html
@@ -9,7 +9,7 @@
 {% block nav_client_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Client details')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Client details')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/client_move.html b/ogcp/templates/actions/client_move.html
index d9bcaac..42bae26 100644
--- a/ogcp/templates/actions/client_move.html
+++ b/ogcp/templates/actions/client_move.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Move %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/delete_center.html b/ogcp/templates/actions/delete_center.html
index 5379a58..13c5670 100644
--- a/ogcp/templates/actions/delete_center.html
+++ b/ogcp/templates/actions/delete_center.html
@@ -8,7 +8,7 @@
 {% block nav_center_delete %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Delete center')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Delete center')}}</h2>
 <p class="text-left mx-5">The following center and its content will be deleted</p>
 <table class="table table-hover mx-5">
 <thead class="thead-light">
diff --git a/ogcp/templates/actions/delete_client.html b/ogcp/templates/actions/delete_client.html
index 1a44eb2..fe8cd8a 100644
--- a/ogcp/templates/actions/delete_client.html
+++ b/ogcp/templates/actions/delete_client.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Delete %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/delete_image.html b/ogcp/templates/actions/delete_image.html
index 4f3c436..3eeab42 100644
--- a/ogcp/templates/actions/delete_image.html
+++ b/ogcp/templates/actions/delete_image.html
@@ -8,9 +8,9 @@
 
 {{ args }}
 
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Delete image %(image_name)s', image_name=image_name) }}
-</h1>
+</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_image_delete'),
diff --git a/ogcp/templates/actions/delete_repo.html b/ogcp/templates/actions/delete_repo.html
index 7a6bd79..17902dd 100644
--- a/ogcp/templates/actions/delete_repo.html
+++ b/ogcp/templates/actions/delete_repo.html
@@ -7,7 +7,7 @@
 {% block nav_repos_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Delete repo')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Delete repo')}}</h2>
 
 {{ wtf.quick_form(form,
 		  action=url_for('action_repo_delete'),
diff --git a/ogcp/templates/actions/delete_room.html b/ogcp/templates/actions/delete_room.html
index b4c3601..b19690e 100644
--- a/ogcp/templates/actions/delete_room.html
+++ b/ogcp/templates/actions/delete_room.html
@@ -8,7 +8,7 @@
 {% block nav_room_delete %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Delete room')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Delete room')}}</h2>
 
 {% if children %}
 <p class="text-left mx-5">The following room and its content will be deleted</p>
diff --git a/ogcp/templates/actions/delete_server.html b/ogcp/templates/actions/delete_server.html
index 8f9417e..77cd202 100644
--- a/ogcp/templates/actions/delete_server.html
+++ b/ogcp/templates/actions/delete_server.html
@@ -8,9 +8,9 @@
 
 {{ args }}
 
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
 {{ _('Delete server %(server_name)s', server_name=form.name.data) }}
-</h1>
+</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('server_delete_post'),
diff --git a/ogcp/templates/actions/folder_add.html b/ogcp/templates/actions/folder_add.html
index 70f7e57..e56fcf6 100644
--- a/ogcp/templates/actions/folder_add.html
+++ b/ogcp/templates/actions/folder_add.html
@@ -8,7 +8,7 @@
 {% block nav_folder_add %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add folder')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add folder')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/folder_delete.html b/ogcp/templates/actions/folder_delete.html
index 0f58026..dba29b7 100644
--- a/ogcp/templates/actions/folder_delete.html
+++ b/ogcp/templates/actions/folder_delete.html
@@ -8,7 +8,7 @@
 {% block nav_folder_delete %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Delete folder')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Delete folder')}}</h2>
 
 <p class="text-left mx-5">The following folder and its content will be deleted</p>
 <table class="table table-hover mx-5">
diff --git a/ogcp/templates/actions/folder_update.html b/ogcp/templates/actions/folder_update.html
index 51985e4..da1ff90 100644
--- a/ogcp/templates/actions/folder_update.html
+++ b/ogcp/templates/actions/folder_update.html
@@ -8,7 +8,7 @@
 {% block nav_folder_update %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Update folder')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Update folder')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/hardware.html b/ogcp/templates/actions/hardware.html
index c4f9145..ac7e532 100644
--- a/ogcp/templates/actions/hardware.html
+++ b/ogcp/templates/actions/hardware.html
@@ -8,7 +8,7 @@
 {% block nav_inventory_hardware %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Hardware inventory')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Hardware inventory')}}</h2>
 
 <h2 class="mb-3 mx-5">{{ _('Selected client:') }} {{ form.ips.data }}</h1>
 
diff --git a/ogcp/templates/actions/image_create.html b/ogcp/templates/actions/image_create.html
index 3fb93c7..0865ea0 100644
--- a/ogcp/templates/actions/image_create.html
+++ b/ogcp/templates/actions/image_create.html
@@ -8,7 +8,7 @@
 {% block nav_image_create %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Create a partition image')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Create a partition image')}}</h2>
 
 <h2 class="mx-5">
   {{ _('Selected client') }}: {{ form.ip.data }}
diff --git a/ogcp/templates/actions/image_details.html b/ogcp/templates/actions/image_details.html
index b0677b7..87105cb 100644
--- a/ogcp/templates/actions/image_details.html
+++ b/ogcp/templates/actions/image_details.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 
-<h1 class="m-5">{{_('Image details')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Image details')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/image_restore.html b/ogcp/templates/actions/image_restore.html
index 939ab74..f8a9e78 100644
--- a/ogcp/templates/actions/image_restore.html
+++ b/ogcp/templates/actions/image_restore.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Restore partition image to %(ip_count)d computer(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/image_update.html b/ogcp/templates/actions/image_update.html
index c008aa8..361165a 100644
--- a/ogcp/templates/actions/image_update.html
+++ b/ogcp/templates/actions/image_update.html
@@ -9,7 +9,7 @@
 {% block nav_image_update %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Update partition image')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Update partition image')}}</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/import_clients.html b/ogcp/templates/actions/import_clients.html
index fc852d3..32d8749 100644
--- a/ogcp/templates/actions/import_clients.html
+++ b/ogcp/templates/actions/import_clients.html
@@ -8,7 +8,7 @@
 {% block nav_clients_import %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Import clients')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Import clients')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_clients_import_post'),
diff --git a/ogcp/templates/actions/legacy/log.html b/ogcp/templates/actions/legacy/log.html
index 4659bf0..5df0e62 100644
--- a/ogcp/templates/actions/legacy/log.html
+++ b/ogcp/templates/actions/legacy/log.html
@@ -8,7 +8,7 @@
 {% block nav_logs_log %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Client log')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Client log')}}</h2>
 
 <pre>{{ log }}</pre>
 
diff --git a/ogcp/templates/actions/list_images.html b/ogcp/templates/actions/list_images.html
index f126603..708431c 100644
--- a/ogcp/templates/actions/list_images.html
+++ b/ogcp/templates/actions/list_images.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 
-<h1 class="m-5">{{_('List images')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('List images')}}</h2>
 {% for server in servers %}
     {% for repo, images in server['repos'] %}
     <h4 class="mx-5">{{repo}}</h4>
diff --git a/ogcp/templates/actions/mode.html b/ogcp/templates/actions/mode.html
index 7cefd15..1a1dd27 100644
--- a/ogcp/templates/actions/mode.html
+++ b/ogcp/templates/actions/mode.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Changing boot mode of %(ip_count)d computer(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 </br>
diff --git a/ogcp/templates/actions/oglive.html b/ogcp/templates/actions/oglive.html
index 6cfc523..9c9d48b 100644
--- a/ogcp/templates/actions/oglive.html
+++ b/ogcp/templates/actions/oglive.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Changing ogLive of %(ip_count)d computer(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/poweroff.html b/ogcp/templates/actions/poweroff.html
index 1d2d963..9178628 100644
--- a/ogcp/templates/actions/poweroff.html
+++ b/ogcp/templates/actions/poweroff.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Power off %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/reboot.html b/ogcp/templates/actions/reboot.html
index 882906d..811b9d6 100644
--- a/ogcp/templates/actions/reboot.html
+++ b/ogcp/templates/actions/reboot.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Reboot %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/repo_details.html b/ogcp/templates/actions/repo_details.html
index ee45a97..674abc2 100644
--- a/ogcp/templates/actions/repo_details.html
+++ b/ogcp/templates/actions/repo_details.html
@@ -7,7 +7,7 @@
 {% block nav_repos_info %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Repo details')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Repo details')}}</h2>
 
 {{ wtf.quick_form(form, extra_classes="mx-5") }}
 {% endblock %}
diff --git a/ogcp/templates/actions/repos_add.html b/ogcp/templates/actions/repos_add.html
index 7782014..338f96c 100644
--- a/ogcp/templates/actions/repos_add.html
+++ b/ogcp/templates/actions/repos_add.html
@@ -7,7 +7,7 @@
 {% block nav_repos_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Add repo')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Add repo')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_repo_add'),
diff --git a/ogcp/templates/actions/repos_update.html b/ogcp/templates/actions/repos_update.html
index 3ba0450..15c6b64 100644
--- a/ogcp/templates/actions/repos_update.html
+++ b/ogcp/templates/actions/repos_update.html
@@ -7,7 +7,7 @@
 {% block nav_repos_update %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Update repo')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Update repo')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_repo_update'),
diff --git a/ogcp/templates/actions/room_details.html b/ogcp/templates/actions/room_details.html
index 0c9d59f..3270c0d 100644
--- a/ogcp/templates/actions/room_details.html
+++ b/ogcp/templates/actions/room_details.html
@@ -8,7 +8,7 @@
 {% block nav_room_details %} active {% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Room details')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Room details')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/room_update.html b/ogcp/templates/actions/room_update.html
index 608b904..ec9e7d7 100644
--- a/ogcp/templates/actions/room_update.html
+++ b/ogcp/templates/actions/room_update.html
@@ -8,7 +8,7 @@
 {% block nav_room_add %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Update room')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Update room')}}</h2>
 
 {{ wtf.quick_form(form,
                   method='post',
diff --git a/ogcp/templates/actions/script_output.html b/ogcp/templates/actions/script_output.html
index c7ffdcb..a491f4c 100644
--- a/ogcp/templates/actions/script_output.html
+++ b/ogcp/templates/actions/script_output.html
@@ -9,9 +9,9 @@
 {% block nav_script_output %} active {% endblock %}
 {% block content %}
 
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
     {{ _('Script output') }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/script_run.html b/ogcp/templates/actions/script_run.html
index 700134e..792001a 100644
--- a/ogcp/templates/actions/script_run.html
+++ b/ogcp/templates/actions/script_run.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Run script for %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/select_client.html b/ogcp/templates/actions/select_client.html
index 01a4b1e..0415621 100644
--- a/ogcp/templates/actions/select_client.html
+++ b/ogcp/templates/actions/select_client.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Partitioning %(ip_count)d client(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/session.html b/ogcp/templates/actions/session.html
index 56865fb..bd7ac95 100644
--- a/ogcp/templates/actions/session.html
+++ b/ogcp/templates/actions/session.html
@@ -10,9 +10,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Start %(ip_count)d client(s) session', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/actions/setup.html b/ogcp/templates/actions/setup.html
index c64c676..fafcb87 100644
--- a/ogcp/templates/actions/setup.html
+++ b/ogcp/templates/actions/setup.html
@@ -7,7 +7,7 @@
 {% block nav_setup_setup %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Partition and Format')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Partition and Format')}}</h2>
 
 <form method="GET" id="changeDiskForm">
     <input type="hidden" name="ips" value="{{ ips }}"/>
diff --git a/ogcp/templates/actions/software.html b/ogcp/templates/actions/software.html
index 52a6a51..8526eb7 100644
--- a/ogcp/templates/actions/software.html
+++ b/ogcp/templates/actions/software.html
@@ -8,7 +8,7 @@
 {% block nav_inventory_software %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Software Inventory')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Software Inventory')}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('action_software'),
diff --git a/ogcp/templates/actions/software_list.html b/ogcp/templates/actions/software_list.html
index 5b7c6cc..c3ad5db 100644
--- a/ogcp/templates/actions/software_list.html
+++ b/ogcp/templates/actions/software_list.html
@@ -8,7 +8,7 @@
 {% block nav_inventory_software %} active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Software inventory')}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Software inventory')}}</h2>
 
 <h2 class="mb-3 mx-5">{{ _('Selected client:') }} {{ form.ips.data }}</h1>
 
diff --git a/ogcp/templates/actions/wol.html b/ogcp/templates/actions/wol.html
index adeb2e0..4dabb26 100644
--- a/ogcp/templates/actions/wol.html
+++ b/ogcp/templates/actions/wol.html
@@ -11,9 +11,9 @@
 
 {% set ip_list = form.ips.data.split(' ') %}
 {% set ip_count = ip_list | length %}
-<h1 class="m-5">
+<h2 class="mx-5 subhead-heading">
   {{ _('Powering on %(ip_count)d computer(s)', ip_count=ip_count) }}
-</h1>
+</h2>
 
 {{ macros.cmd_selected_clients(selected_clients) }}
 
diff --git a/ogcp/templates/auth/delete_user.html b/ogcp/templates/auth/delete_user.html
index 42301ae..5584a3e 100644
--- a/ogcp/templates/auth/delete_user.html
+++ b/ogcp/templates/auth/delete_user.html
@@ -7,7 +7,7 @@
 {% block nav_user_edit %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{{_('Delete user {}').format(form.username.data)}}</h1>
+<h2 class="mx-5 subhead-heading">{{_('Delete user {}').format(form.username.data)}}</h2>
 
 {{ wtf.quick_form(form,
                   action=url_for('user_delete_post'),
diff --git a/ogcp/templates/auth/user_form.html b/ogcp/templates/auth/user_form.html
index 7b6b338..1cba9b2 100644
--- a/ogcp/templates/auth/user_form.html
+++ b/ogcp/templates/auth/user_form.html
@@ -7,7 +7,7 @@
 {% block nav_user_add %}active{% endblock %}
 {% block content %}
 
-<h1 class="m-5">{% block subhead_heading %}{% endblock %}</h1>
+<h2 class="mx-5 subhead-heading">{% block subhead_heading %}{% endblock %}</h2>
 
 <form action="{% block form_action %}{% endblock %}" method="post" class="form">
     {{ form.hidden_tag() }}
diff --git a/ogcp/templates/base.html b/ogcp/templates/base.html
index 2af9873..902b021 100644
--- a/ogcp/templates/base.html
+++ b/ogcp/templates/base.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='AdminLTE/plugins/fontawesome-free/css/all.min.css') }}">
     <!-- Theme style -->
     <link rel="stylesheet" href="{{ url_for('static', filename='AdminLTE/dist/css/adminlte.min.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/soleta.css') }}?v=2" />
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/soleta.css') }}?v=3" />
     {% endblock %}
 </head>
 <body>
diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html
index 4047e87..eda57ed 100644
--- a/ogcp/templates/macros.html
+++ b/ogcp/templates/macros.html
@@ -91,7 +91,7 @@
 {% endmacro %}
 
 {% macro selected_clients() -%}
-<hr><h2>{{_('Selected clients')}}</h2>
+<h2 class="mx-5 subhead-heading">{{_('Selected clients')}}</h2>
 <div class="card">
   <div class="card-body">
     <ul id="clients-color-legend" class="d-flex flex-wrap justify-content-center nav ogcp-nav nav-pills">