diff --git a/ogcp/templates/actions/add_center.html b/ogcp/templates/actions/add_center.html
index 78886d6..5397fcf 100644
--- a/ogcp/templates/actions/add_center.html
+++ b/ogcp/templates/actions/add_center.html
@@ -14,7 +14,7 @@
                   action=url_for('action_center_add'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/add_room.html b/ogcp/templates/actions/add_room.html
index 5eedf4e..d1f23c9 100644
--- a/ogcp/templates/actions/add_room.html
+++ b/ogcp/templates/actions/add_room.html
@@ -14,7 +14,7 @@
                   action=url_for('action_room_add'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/add_server.html b/ogcp/templates/actions/add_server.html
index 6509ce4..9e84ad2 100644
--- a/ogcp/templates/actions/add_server.html
+++ b/ogcp/templates/actions/add_server.html
@@ -12,6 +12,7 @@
 {{ wtf.quick_form(form,
                   action=url_for('server_add_post'),
                   method='post',
-                  button_map={'submit_btn':'primary'}) }}
+                  button_map={'submit_btn':'primary'},
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/center_details.html b/ogcp/templates/actions/center_details.html
index 6221de2..f752915 100644
--- a/ogcp/templates/actions/center_details.html
+++ b/ogcp/templates/actions/center_details.html
@@ -13,6 +13,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/center_update.html b/ogcp/templates/actions/center_update.html
index e866fac..3af9904 100644
--- a/ogcp/templates/actions/center_update.html
+++ b/ogcp/templates/actions/center_update.html
@@ -13,6 +13,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/client_add.html b/ogcp/templates/actions/client_add.html
index d24c138..341004b 100644
--- a/ogcp/templates/actions/client_add.html
+++ b/ogcp/templates/actions/client_add.html
@@ -14,6 +14,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/client_move.html b/ogcp/templates/actions/client_move.html
index 42bae26..1976f7b 100644
--- a/ogcp/templates/actions/client_move.html
+++ b/ogcp/templates/actions/client_move.html
@@ -20,6 +20,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/delete_center.html b/ogcp/templates/actions/delete_center.html
index 13c5670..a9a747f 100644
--- a/ogcp/templates/actions/delete_center.html
+++ b/ogcp/templates/actions/delete_center.html
@@ -45,7 +45,7 @@
                   action=url_for('action_center_delete'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/delete_client.html b/ogcp/templates/actions/delete_client.html
index fe8cd8a..834beb5 100644
--- a/ogcp/templates/actions/delete_client.html
+++ b/ogcp/templates/actions/delete_client.html
@@ -21,7 +21,7 @@
                   action=url_for('action_client_delete'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/delete_image.html b/ogcp/templates/actions/delete_image.html
index 69acc79..4163863 100644
--- a/ogcp/templates/actions/delete_image.html
+++ b/ogcp/templates/actions/delete_image.html
@@ -17,7 +17,7 @@
                   action=url_for('action_image_delete'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/delete_repo.html b/ogcp/templates/actions/delete_repo.html
index 16b378b..45fea66 100644
--- a/ogcp/templates/actions/delete_repo.html
+++ b/ogcp/templates/actions/delete_repo.html
@@ -11,7 +11,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Delete repo')}}</h2>
 
-<form class="form mx-5" method="POST">
+<form class="form m-5" method="POST">
     {{ form.hidden_tag() }}
 
     {{ form.server() }}
diff --git a/ogcp/templates/actions/delete_room.html b/ogcp/templates/actions/delete_room.html
index b19690e..f6fc0f4 100644
--- a/ogcp/templates/actions/delete_room.html
+++ b/ogcp/templates/actions/delete_room.html
@@ -48,7 +48,7 @@
                   action=url_for('action_room_delete'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/delete_server.html b/ogcp/templates/actions/delete_server.html
index 77cd202..553482d 100644
--- a/ogcp/templates/actions/delete_server.html
+++ b/ogcp/templates/actions/delete_server.html
@@ -16,7 +16,7 @@
                   action=url_for('server_delete_post'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/folder_add.html b/ogcp/templates/actions/folder_add.html
index e56fcf6..cbf1190 100644
--- a/ogcp/templates/actions/folder_add.html
+++ b/ogcp/templates/actions/folder_add.html
@@ -13,7 +13,7 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/folder_delete.html b/ogcp/templates/actions/folder_delete.html
index dba29b7..b4f6bc9 100644
--- a/ogcp/templates/actions/folder_delete.html
+++ b/ogcp/templates/actions/folder_delete.html
@@ -45,6 +45,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'danger'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/folder_update.html b/ogcp/templates/actions/folder_update.html
index da1ff90..4edb055 100644
--- a/ogcp/templates/actions/folder_update.html
+++ b/ogcp/templates/actions/folder_update.html
@@ -13,7 +13,7 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/hardware.html b/ogcp/templates/actions/hardware.html
index ac7e532..ed5a5b6 100644
--- a/ogcp/templates/actions/hardware.html
+++ b/ogcp/templates/actions/hardware.html
@@ -16,7 +16,7 @@
                   action=url_for('action_hardware'),
                   method='post',
                   button_map={'refresh': 'primary'},
-                  extra_classes='m-2')}}
+                  extra_classes='m-5')}}
 
 <table class="table table-striped">
   <thead class="thead-dark">
diff --git a/ogcp/templates/actions/image_config.html b/ogcp/templates/actions/image_config.html
index 26fc737..1a9047b 100644
--- a/ogcp/templates/actions/image_config.html
+++ b/ogcp/templates/actions/image_config.html
@@ -8,7 +8,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Update image')}} {{ form.name.data }}</h2>
 
-<form  class="form mx-5" method="POST" action="{{ url_for('action_image_config') }}">
+<form  class="form m-5" method="POST" action="{{ url_for('action_image_config') }}">
     {{ form.hidden_tag() }}
 
     {{ form.image_id() }}
diff --git a/ogcp/templates/actions/image_create.html b/ogcp/templates/actions/image_create.html
index 024aeb8..8fc1d80 100644
--- a/ogcp/templates/actions/image_create.html
+++ b/ogcp/templates/actions/image_create.html
@@ -19,6 +19,6 @@
                   action=url_for('action_image_create'),
                   method='post',
                   button_map={'create': 'primary'},
-                  extra_classes='mx-5') }}
+                  extra_classes='m-5') }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/image_details.html b/ogcp/templates/actions/image_details.html
index 941ca82..d166f68 100644
--- a/ogcp/templates/actions/image_details.html
+++ b/ogcp/templates/actions/image_details.html
@@ -8,7 +8,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Image details')}}</h2>
 
-<div class="container mx-5">
+<div class="container m-5">
     <form class="form" method="POST">
         {{ form.hidden_tag() }}
 
diff --git a/ogcp/templates/actions/import_clients.html b/ogcp/templates/actions/import_clients.html
index 32d8749..ab3c808 100644
--- a/ogcp/templates/actions/import_clients.html
+++ b/ogcp/templates/actions/import_clients.html
@@ -14,6 +14,6 @@
                   action=url_for('action_clients_import_post'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/poweroff.html b/ogcp/templates/actions/poweroff.html
index 9178628..c9180e0 100644
--- a/ogcp/templates/actions/poweroff.html
+++ b/ogcp/templates/actions/poweroff.html
@@ -21,7 +21,7 @@
                   action=url_for('action_poweroff'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/reboot.html b/ogcp/templates/actions/reboot.html
index 811b9d6..6b5fa0f 100644
--- a/ogcp/templates/actions/reboot.html
+++ b/ogcp/templates/actions/reboot.html
@@ -21,7 +21,7 @@
                   action=url_for('action_reboot'),
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/repo_details.html b/ogcp/templates/actions/repo_details.html
index d91f961..f553966 100644
--- a/ogcp/templates/actions/repo_details.html
+++ b/ogcp/templates/actions/repo_details.html
@@ -11,7 +11,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Repo details')}}</h2>
 
-<form class="form mx-5" method="POST">
+<form class="form m-5" method="POST">
     {{ form.hidden_tag() }}
 
     {{ form.server() }}
diff --git a/ogcp/templates/actions/room_details.html b/ogcp/templates/actions/room_details.html
index 3270c0d..5b49610 100644
--- a/ogcp/templates/actions/room_details.html
+++ b/ogcp/templates/actions/room_details.html
@@ -13,6 +13,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/room_update.html b/ogcp/templates/actions/room_update.html
index ec9e7d7..4b97035 100644
--- a/ogcp/templates/actions/room_update.html
+++ b/ogcp/templates/actions/room_update.html
@@ -13,7 +13,7 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
 
diff --git a/ogcp/templates/actions/script_run.html b/ogcp/templates/actions/script_run.html
index 792001a..6c1530e 100644
--- a/ogcp/templates/actions/script_run.html
+++ b/ogcp/templates/actions/script_run.html
@@ -20,6 +20,6 @@
 {{ wtf.quick_form(form,
                   method='post',
                   button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/actions/server_update.html b/ogcp/templates/actions/server_update.html
index ae2513b..ec66ce0 100644
--- a/ogcp/templates/actions/server_update.html
+++ b/ogcp/templates/actions/server_update.html
@@ -9,7 +9,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Update server')}}</h2>
 
-<form class="form mx-5" method="POST">
+<form class="form m-5" method="POST">
     {{ form.hidden_tag() }}
 
     {{ form.server_addr() }}
diff --git a/ogcp/templates/actions/session.html b/ogcp/templates/actions/session.html
index 0410754..0bbcb81 100644
--- a/ogcp/templates/actions/session.html
+++ b/ogcp/templates/actions/session.html
@@ -18,13 +18,13 @@
 
 {% if os_groups|length > 0 %}
 
-<p>
+<p class="mx-5">
 {% if os_groups|length > 1 %}
 The selected clients have different installed OS:
 {% endif %}
 </p>
 
-<form class="form-inline" method="POST" id="sessionForm">
+<form class="form-inline m-5" method="POST" id="sessionForm">
     <table class="table table-hover">
         <thead class="thead-light">
             <tr>
diff --git a/ogcp/templates/actions/software.html b/ogcp/templates/actions/software.html
index 8526eb7..3329867 100644
--- a/ogcp/templates/actions/software.html
+++ b/ogcp/templates/actions/software.html
@@ -14,6 +14,6 @@
                   action=url_for('action_software'),
                   method='post',
                   button_map={'view': 'primary', 'update': 'primary'},
-                  extra_classes="mx-5")}}
+                  extra_classes="m-5")}}
 
 {% endblock %}
diff --git a/ogcp/templates/auth/delete_user.html b/ogcp/templates/auth/delete_user.html
index de2cdf0..bb957dd 100644
--- a/ogcp/templates/auth/delete_user.html
+++ b/ogcp/templates/auth/delete_user.html
@@ -13,6 +13,6 @@
                   action=url_for('user_delete_post'),
                   method='post',
                   button_map={'submit_btn':'primary'},
-                  extra_classes="mx-5") }}
+                  extra_classes="m-5") }}
 
 {% endblock %}
diff --git a/ogcp/templates/disk_inspector.html b/ogcp/templates/disk_inspector.html
index 2f1b3dc..9966a27 100644
--- a/ogcp/templates/disk_inspector.html
+++ b/ogcp/templates/disk_inspector.html
@@ -1,6 +1,6 @@
 {% if selected_disk is defined and setup_data is defined %}
 
-<form class="form-inline mx-5" method="POST" id="setupForm">
+<form class="form-inline m-5" method="POST" id="setupForm">
     {{ disk_form.hidden_tag() }}
     {{ disk_form.ips() }}