diff --git a/static/madmin/static/js/loading_dialogue.js b/static/madmin/static/js/loading_dialogue.js
new file mode 100644
index 000000000..260dc21a1
--- /dev/null
+++ b/static/madmin/static/js/loading_dialogue.js
@@ -0,0 +1,15 @@
+function loadingBlockUI(message) {
+    $.fn.center = function () {
+        this.css("position", "absolute");
+        this.css("top", ($(window).height() - this.height()) / 2 + $(window).scrollTop() + "px");
+        this.css("left", ($(window).width() - this.width()) / 2 + $(window).scrollLeft() + "px");
+        return this;
+    }
+
+$.blockUI({css: {
+            height: 'auto',
+            textAlign: 'center',
+            width: 'auto'
+		}, message: '<img src="/static/loading.gif" width="100px" /><br/><h2  style="margin-left: 20px;margin-right: 20px;">' + message + '</h2>' })
+            $('.blockUI.blockMsg').center();
+}
\ No newline at end of file
diff --git a/static/madmin/static/style/MAD.css b/static/madmin/static/style/MAD.css
index a5e028f70..2499f8126 100644
--- a/static/madmin/static/style/MAD.css
+++ b/static/madmin/static/style/MAD.css
@@ -60,7 +60,7 @@
 }
 
 [data-theme="dark"] .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-    color:# bbb !important;
+    color: #bbb !important;
     border: 1px solid #979797;
     background: #585858 !important;
 }
diff --git a/static/madmin/templates/autoconfig_config_editor.html b/static/madmin/templates/autoconfig_config_editor.html
index f8285a3bc..5d4bead21 100644
--- a/static/madmin/templates/autoconfig_config_editor.html
+++ b/static/madmin/templates/autoconfig_config_editor.html
@@ -7,11 +7,12 @@
 
 {% block scripts %}
 <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
+
 <script type="text/javascript" src="{{ url_for('static', filename='js/madmin_settings.js') }}"></script>
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}')
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/autoconfig_pending.html b/static/madmin/templates/autoconfig_pending.html
index 87ed17533..64baa1cca 100644
--- a/static/madmin/templates/autoconfig_pending.html
+++ b/static/madmin/templates/autoconfig_pending.html
@@ -27,7 +27,7 @@
       var selected_uri = $(this).children("option:selected").val();
       var devices = $('.bulk_sel:checkbox:checked');
       if(devices.length > 0 && confirm('Are you sure you want to bulk set to '+ $(".bulk_update").val() +'?')) {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Bulk Updating</h2>' });
+          loadingBlockUI("Bulk Updating")
         var status = $(".bulk_update").val() == 'Accept';
         $.each($('.bulk_sel:checkbox:checked'), function() {
           uri = '{{ url_for('api_autoconf') }}/' + $(this).data('identifier');
@@ -39,7 +39,7 @@
     $(".delete_sess").click(function() {
         var session_id = $(this).data('identifier');
         if(confirm('Are you sure you want to delete this session?')) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Updating registration...</h2>' });
+            loadingBlockUI("Updating registration")
             $.ajax({
                 url : '{{ url_for('api_autoconf') }}/'+ session_id,
                 type : 'DELETE',
@@ -77,7 +77,7 @@
             additional = "This will create a new device instead of using an existing device.  To use an existing device click on the registration IP address."
         }
         if(confirm('Are you sure you want to '+ msg +' this session?  '+ additional)) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Updating registration...</h2>' });
+            loadingBlockUI("Updating registration")
             $.ajax({
                 url : '{{ url_for('api_autoconf') }}/'+ session_id,
                 contentType : 'application/json',
diff --git a/static/madmin/templates/autoconfig_pending_dev.html b/static/madmin/templates/autoconfig_pending_dev.html
index b9fb6fa82..705eaa161 100644
--- a/static/madmin/templates/autoconfig_pending_dev.html
+++ b/static/madmin/templates/autoconfig_pending_dev.html
@@ -5,9 +5,10 @@
 
 {% block scripts %}
 <script>
+
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}')
         save_data = {
             'status': 1,
             'walker_id': $("select[name=walker_id]").val(),
diff --git a/static/madmin/templates/base.html b/static/madmin/templates/base.html
index c534b0f0a..c1e16ebe3 100644
--- a/static/madmin/templates/base.html
+++ b/static/madmin/templates/base.html
@@ -120,9 +120,19 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" integrity="sha256-9wRM03dUw6ABCs+AU69WbK33oktrlXamEXMvxUaF+KU=" crossorigin="anonymous"></script>
     <script src="https://cdn.datatables.net/responsive/2.2.5/js/dataTables.responsive.min.js" crossorigin="anonymous"></script>
     <script src="{{ url_for('static', filename='js/dark-mode-switch.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/loading_dialogue.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.Aplus.min.js') }}"></script>
     <script>
+
     $(document).ready(function() {
+        $.fn.center = function () {
+            this.css("position","absolute");
+            this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px");
+            this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px");
+            return this;
+        }
+
+
       if (darkSwitch) {
         initTheme();
         darkSwitch.addEventListener('change', () => {
@@ -136,7 +146,9 @@
 
       $("#reload").click(function() {
         if (confirm('Do you really want reload and apply settings?')) {
-          $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>' });
+          $('#navbarNav').removeClass()
+          $("#navbarNav").addClass('navbar-collapse collapse')
+            loadingBlockUI("Applying")
           $(location).attr('href', '{{ url_for('reload') }}');
         }
       });
diff --git a/static/madmin/templates/installation_status.html b/static/madmin/templates/installation_status.html
index e712ea451..6bc3b3d07 100644
--- a/static/madmin/templates/installation_status.html
+++ b/static/madmin/templates/installation_status.html
@@ -9,12 +9,12 @@
         $(tableGridHtmlId).DataTable({
             "data": gridData,
             "columns": [
-                { data: 'origin', title: 'Device' },
-                { data: 'jobname', title: 'File / Command' },
-                { data: 'status', title: 'Status' },
-                { data: null, title: 'Init Date/Time' },
-                { data: null, title: 'Date/Time' },
-                { data: null, title: 'Action' }
+                { data: 'origin', title: 'Device', responsivePriority: 1},
+                { data: 'jobname', title: 'File / Command', responsivePriority: 3 },
+                { data: 'status', title: 'Status', responsivePriority: 2 },
+                { data: null, title: 'Init Date/Time',responsivePriority: 6 },
+                { data: null, title: 'Date/Time', responsivePriority: 5 },
+                { data: null, title: 'Action',responsivePriority: 4 }
             ],
             "columnDefs": [
                 {
diff --git a/static/madmin/templates/madmin_apk_root.html b/static/madmin/templates/madmin_apk_root.html
index 2fb0248f5..d5543d5fe 100644
--- a/static/madmin/templates/madmin_apk_root.html
+++ b/static/madmin/templates/madmin_apk_root.html
@@ -39,7 +39,7 @@
         var fd = new FormData();
         fd.append('file', $('#file-input')[0].files[0]);
         fd.append('filename', $('#file-input')[0].files[0].name);
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Uploading APK...</h2>' });
+        loadingBlockUI("Uploading APK")
         $.ajax({
             url: url,
             type: 'POST',
@@ -65,7 +65,7 @@
 
     $(".search").click(function() {
         if(confirm('Are you sure you want to search for an updated APK?  Currently no locks so dont spam it :)')) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Starting search...</h2>' });
+            loadingBlockUI("Starting search")
             rpc_call = {
               'call': 'search'
             }
@@ -93,7 +93,7 @@
 
     $(".bulk_update").click(function() {
         if(confirm('Are you sure you want to Update and Download every APK?')) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Bulk Updating...</h2>' });
+            loadingBlockUI("Bulk Updating")
             rpc_call = {
               'call': 'search_download'
             }
@@ -120,7 +120,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this APK?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting an APK...</h2>' });
+            loadingBlockUI("Deleting an APK")
             var apk_type = $(this).data('apk_type');
             var apk_arch = $(this).data('apk_arch');
             var url = '{{ url_for('api_madapk') }}/'+ apk_type +'/'+ apk_arch;
@@ -203,7 +203,7 @@
 
     function download_apk(){
         if(confirm('Are you sure you want to download the APK?')) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Starting download...</h2>' });
+            loadingBlockUI("Starting download")
             rpc_call = {
               'call': 'import'
             }
diff --git a/static/madmin/templates/quests.html b/static/madmin/templates/quests.html
index fa023293c..aec7e6d23 100644
--- a/static/madmin/templates/quests.html
+++ b/static/madmin/templates/quests.html
@@ -57,9 +57,7 @@
 
 $(document).ready(function() {
     $("#navgyms").addClass("active");
-    $.blockUI({
-        message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>'
-    });
+    loadingBlockUI("Loading")
     $.ajax({
         type: "GET",
         url: "{{ url_for('get_quests') }}?fence={{fence}}",
diff --git a/static/madmin/templates/settings_areas.html b/static/madmin/templates/settings_areas.html
index c053b8788..8cd943e8f 100644
--- a/static/madmin/templates/settings_areas.html
+++ b/static/madmin/templates/settings_areas.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' )
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
@@ -47,7 +47,7 @@
   function recalculate_route() {
     if(confirm('Are you sure you want to recalculate this route?')) {
         var elem = $(this);
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Recalculating routefile...</h2>' });
+        loadingBlockUI("Recalculating routefile")
         rpc_call = {
           'call': 'recalculate'
         }
diff --git a/static/madmin/templates/settings_auth.html b/static/madmin/templates/settings_auth.html
index 16b2e2d99..9e36cc770 100644
--- a/static/madmin/templates/settings_auth.html
+++ b/static/madmin/templates/settings_auth.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' )
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/settings_devices.html b/static/madmin/templates/settings_devices.html
index eaf3293e3..7db61d57d 100644
--- a/static/madmin/templates/settings_devices.html
+++ b/static/madmin/templates/settings_devices.html
@@ -38,7 +38,7 @@
         var uri = '{{ base_uri }}/'+ $(this).data('identifier');
         var walker_uri = $(this).children("option:selected").attr('name');
         var patch_data = {"walker": walker_uri};
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading")
         bulk_patch(uri, patch_data);
         $.unblockUI();
     });
@@ -46,7 +46,7 @@
       var selected_uri = $(this).children("option:selected").val();
       var devices = $('.bulk_sel:checkbox:checked');
       if(devices.length > 0 && confirm('Are you sure you want to bulk update?')) {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Bulk Updating</h2>' });
+        loadingBlockUI("Bulk Updating");
         var data = {};
         var operation = bulk_patch;
         if(selected_uri.indexOf('walker') > 0) {
@@ -69,7 +69,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' )
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
@@ -97,7 +97,7 @@
     });
     $(".dev_state").click(function() {
         if(confirm('Are you sure you want to toggle state of this device?')) {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Toggling device state...</h2>' });
+            loadingBlockUI("Toggling device state")
             rpc_call = {
               'call': 'device_state',
               'args': {
diff --git a/static/madmin/templates/settings_geofences.html b/static/madmin/templates/settings_geofences.html
index 5260f6647..66c2347fe 100644
--- a/static/madmin/templates/settings_geofences.html
+++ b/static/madmin/templates/settings_geofences.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' );
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/settings_ivlists.html b/static/madmin/templates/settings_ivlists.html
index 884966929..1abbda96a 100644
--- a/static/madmin/templates/settings_ivlists.html
+++ b/static/madmin/templates/settings_ivlists.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' );
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/settings_pogoauth.html b/static/madmin/templates/settings_pogoauth.html
index 1badbabb6..3e4310b93 100644
--- a/static/madmin/templates/settings_pogoauth.html
+++ b/static/madmin/templates/settings_pogoauth.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' );
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/settings_sharedsettings.html b/static/madmin/templates/settings_sharedsettings.html
index c2b512420..7822b8f07 100644
--- a/static/madmin/templates/settings_sharedsettings.html
+++ b/static/madmin/templates/settings_sharedsettings.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' );
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/settings_singlearea.html b/static/madmin/templates/settings_singlearea.html
index 84ad556d8..3c2434791 100644
--- a/static/madmin/templates/settings_singlearea.html
+++ b/static/madmin/templates/settings_singlearea.html
@@ -14,7 +14,7 @@
 }
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving a {{ subtab }}' );
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singleauth.html b/static/madmin/templates/settings_singleauth.html
index 1287d6c7a..386284bd3 100644
--- a/static/madmin/templates/settings_singleauth.html
+++ b/static/madmin/templates/settings_singleauth.html
@@ -10,7 +10,7 @@
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singledevice.html b/static/madmin/templates/settings_singledevice.html
index 646a7a563..ef6577653 100644
--- a/static/madmin/templates/settings_singledevice.html
+++ b/static/madmin/templates/settings_singledevice.html
@@ -16,7 +16,7 @@
         if(!confirm('Do you really wanna delete all information about visited pokestops for device {{ element.origin }}?')) {
           return;
         }
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Clearing ...</h2>' });
+        loadingBlockUI("Clearing");
         rpc_call = {
           'call': 'flush_level'
         }
diff --git a/static/madmin/templates/settings_singlegeofence.html b/static/madmin/templates/settings_singlegeofence.html
index 735ba4188..434ecb203 100644
--- a/static/madmin/templates/settings_singlegeofence.html
+++ b/static/madmin/templates/settings_singlegeofence.html
@@ -10,7 +10,7 @@
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singleivlist.html b/static/madmin/templates/settings_singleivlist.html
index cecd155e7..881ebf715 100644
--- a/static/madmin/templates/settings_singleivlist.html
+++ b/static/madmin/templates/settings_singleivlist.html
@@ -12,7 +12,7 @@
 <script>
     $(document).ready(function () {
         $("#submit").click(function() {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+            loadingBlockUI('Saving {{ subtab }}');
             save_data = get_save_data();
             if(isEmptyObj(save_data) != false) {
                 alert('No changes have been made');
@@ -138,7 +138,7 @@ <h1 class="display-5">{{ element.monlist }}</h1>
         </div>
         <div class="form-gropup" id="add-pokemon">
           <label for="monlist-search">List of mons</label>
-          <input type="text" id="pokemon-search" placeholder="Search for mon name..." class="form-control" data-skip="true">
+          <input type="text" id="pokemon-search" placeholder="Search for mon name" class="form-control" data-skip="true">
           <small class="form-text text-muted result-hint" style="display: none">Click on a result to add it to the list:</small>
           <div id="pokemon-search-output" class="nav nav-pills"></div>
         </div>
diff --git a/static/madmin/templates/settings_singlepogoauth.html b/static/madmin/templates/settings_singlepogoauth.html
index d73e306b0..790e4a875 100644
--- a/static/madmin/templates/settings_singlepogoauth.html
+++ b/static/madmin/templates/settings_singlepogoauth.html
@@ -10,7 +10,7 @@
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singleroutecalc.html b/static/madmin/templates/settings_singleroutecalc.html
index f827297ca..459be29ed 100644
--- a/static/madmin/templates/settings_singleroutecalc.html
+++ b/static/madmin/templates/settings_singleroutecalc.html
@@ -10,7 +10,7 @@
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singlesharedsetting.html b/static/madmin/templates/settings_singlesharedsetting.html
index 34bad26bf..de4e71779 100644
--- a/static/madmin/templates/settings_singlesharedsetting.html
+++ b/static/madmin/templates/settings_singlesharedsetting.html
@@ -12,7 +12,7 @@
 <script>
 $(document).ready(function () {
     $("#submit").click(function() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_singlewalker.html b/static/madmin/templates/settings_singlewalker.html
index 0aecf50c4..981dbb3df 100644
--- a/static/madmin/templates/settings_singlewalker.html
+++ b/static/madmin/templates/settings_singlewalker.html
@@ -16,7 +16,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $("#submit").click(function() {
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+            loadingBlockUI('Saving {{ subtab }}');
             save_data = get_save_data();
             if(isEmptyObj(save_data) != false) {
                 alert('No changes have been made');
diff --git a/static/madmin/templates/settings_walkerarea.html b/static/madmin/templates/settings_walkerarea.html
index f374da3aa..7047aa926 100644
--- a/static/madmin/templates/settings_walkerarea.html
+++ b/static/madmin/templates/settings_walkerarea.html
@@ -43,7 +43,7 @@
         if(validate_walker() == false) {
             return;
         }
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Saving {{ subtab }}...</h2>' });
+        loadingBlockUI('Saving {{ subtab }}');
         save_data = get_save_data();
         if(isEmptyObj(save_data) != false) {
             alert('No changes have been made');
diff --git a/static/madmin/templates/settings_walkers.html b/static/madmin/templates/settings_walkers.html
index 99d8b2c05..c9130d8c9 100644
--- a/static/madmin/templates/settings_walkers.html
+++ b/static/madmin/templates/settings_walkers.html
@@ -11,7 +11,7 @@
     $(".delete").click(function() {
         if(confirm('Are you sure you want to delete this resource?')) {
             var elem =  $(this);
-            $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Deleting a {{ subtab }}...</h2>' });
+            loadingBlockUI('Deleting a  {{ subtab }}' );
             $.ajax({
                 url : '{{ base_uri }}/'+ $(this).data('identifier'),
                 type : 'DELETE',
diff --git a/static/madmin/templates/statistics.html b/static/madmin/templates/statistics.html
index 811195ae4..85dc7479a 100644
--- a/static/madmin/templates/statistics.html
+++ b/static/madmin/templates/statistics.html
@@ -108,7 +108,7 @@
             }
         };
 
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
 
         $.ajax({
             "url": "get_game_stats?minutes_spawn={{ minutes_spawn }}&minutes_usage={{ minutes_usage }}",
diff --git a/static/madmin/templates/statistics/mon_statistics.html b/static/madmin/templates/statistics/mon_statistics.html
index 5ce707c78..056707cce 100644
--- a/static/madmin/templates/statistics/mon_statistics.html
+++ b/static/madmin/templates/statistics/mon_statistics.html
@@ -99,7 +99,7 @@
           }
       };
 
-      $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif').lstrip('/') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
 
       $.ajax({
           "url": "get_game_stats_mon?minutes_spawn={{ minutes_spawn }}&minutes_usage={{ minutes_usage }}",
diff --git a/static/madmin/templates/statistics/shiny_statistics.html b/static/madmin/templates/statistics/shiny_statistics.html
index 0eeb82987..851e44816 100644
--- a/static/madmin/templates/statistics/shiny_statistics.html
+++ b/static/madmin/templates/statistics/shiny_statistics.html
@@ -230,7 +230,7 @@
 
      function loadData(timestamp_from, timestamp_to) {
          console.log("Loading data for from: " + timestamp_from + " to: " + timestamp_to);
-         $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif').lstrip('/') }}" width="100px" /><br /><h2>Loading...</h2>' });
+        loadingBlockUI("Loading");
          $.ajax({
             "url": "get_game_stats_shiny?from="+timestamp_from+"&to="+timestamp_to,
             "type": "GET",
diff --git a/static/madmin/templates/statistics/spawn_details.html b/static/madmin/templates/statistics/spawn_details.html
index 9d4f4d42d..bbd141ffc 100644
--- a/static/madmin/templates/statistics/spawn_details.html
+++ b/static/madmin/templates/statistics/spawn_details.html
@@ -63,7 +63,7 @@
   }
 
     $(document).ready(function () {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
         $('body').Aplus();
         $("#navgyms").addClass("active");
         $.ajax({
diff --git a/static/madmin/templates/statistics/spawn_statistics.html b/static/madmin/templates/statistics/spawn_statistics.html
index 64a6b8450..058c3165b 100644
--- a/static/madmin/templates/statistics/spawn_statistics.html
+++ b/static/madmin/templates/statistics/spawn_statistics.html
@@ -63,7 +63,7 @@
   }
 
     function loadData() {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Loading...</h2>' });
+        loadingBlockUI("Loading");
         $('body').Aplus();
         $("#navgyms").addClass("active");
         $.ajax({
@@ -78,7 +78,7 @@
     }
 
         function loadDataByFence() {
-          $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif')}}" width="100px" /><br /><h2>Loading...</h2>' });
+        loadingBlockUI("Loading");
             $('body').Aplus();
             $("#navgyms").addClass("active");
             $.ajax({
@@ -120,7 +120,7 @@
     }
 
     function loadSummary() {
-      $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif')}}" width="100px" /><br /><h2>Quick check, please wait.</h2>' });
+        loadingBlockUI("Quick check, please wait.");
         $('body').Aplus();
         $("#navgyms").addClass("active");
         $.ajax({
diff --git a/static/madmin/templates/statistics/statistics.html b/static/madmin/templates/statistics/statistics.html
index 568b1368b..711e42d73 100644
--- a/static/madmin/templates/statistics/statistics.html
+++ b/static/madmin/templates/statistics/statistics.html
@@ -108,7 +108,7 @@
             }
         };
 
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif').lstrip('/') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
 
         $.ajax({
             "url": "get_game_stats?minutes_spawn={{ minutes_spawn }}&minutes_usage={{ minutes_usage }}",
diff --git a/static/madmin/templates/statistics/stop_quest_statistics.html b/static/madmin/templates/statistics/stop_quest_statistics.html
index 9c2715d5d..c674668ab 100644
--- a/static/madmin/templates/statistics/stop_quest_statistics.html
+++ b/static/madmin/templates/statistics/stop_quest_statistics.html
@@ -171,7 +171,7 @@
 
 
     $(document).ready(function () {
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif').lstrip('/') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
         $('body').Aplus();
         $("#navgyms").addClass("active");
         $.ajax({
diff --git a/static/madmin/templates/statistics_worker.html b/static/madmin/templates/statistics_worker.html
index b071f262c..c0703c736 100644
--- a/static/madmin/templates/statistics_worker.html
+++ b/static/madmin/templates/statistics_worker.html
@@ -99,7 +99,7 @@
             }
         };
 
-        $.blockUI({ message: '<img src="{{ url_for('static', filename='loading.gif') }}" width="100px" /><br /><h2>Load...</h2>' });
+        loadingBlockUI("Loading");
 
         $.ajax({
             "url": "statistics_detection_worker_data?worker={{ worker }}&minutes={{ minutes }}",
diff --git a/static/madmin/templates/status.html b/static/madmin/templates/status.html
index 768023974..5eb33c388 100644
--- a/static/madmin/templates/status.html
+++ b/static/madmin/templates/status.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block header %}
-<link rel="stylesheet" href="static/style/madmin.css" />
+<link rel="stylesheet" href="static/style/madmin.css"/>
 {% endblock %}
 
 {% block scripts %}
@@ -14,221 +14,249 @@
 <script>
     var errorCount = 0;
     var dataTable = $("#show-data-status").DataTable({
-            "ajax": {
-                "url": "get_status",
-                "dataSrc": function (data) {
-                        errorCount = 0;
-                        return data;
-                },
-                "error": function (xhr, error, code) {
-                        errorCount++;
-                        console.log(xhr);
-                        console.log(error);
-                        console.log(code);
-                        if (errorCount == 5) {
-                                alert("Could not get updates from MAD five times in a row. More logs in browser developer console. Is MAD running?");
-                        }
+        "ajax": {
+            "url": "get_status",
+            "dataSrc": function (data) {
+                errorCount = 0;
+                return data;
+            },
+            "error": function (xhr, error, code) {
+                errorCount++;
+                console.log(xhr);
+                console.log(error);
+                console.log(code);
+                if (errorCount == 5) {
+                    alert("Could not get updates from MAD five times in a row. More logs in browser developer console. Is MAD running?");
+                }
+            }
+        },
+        "columns": [
+            {
+                responsivePriority: 1, data: 'name', title: 'Origin',
+                "render": function (data, type, oData) {
+                    return "<a href='{{ url_for('settings_devices') }}?id=" + oData.device_id + "'>" + oData.name + "</a>";
                 }
             },
-            "columns": [
-                {
-                    data: 'name', title: 'Origin',
-                    "render": function (data, type, oData) {
-                        return "<a href='{{ url_for('settings_devices') }}?id=" + oData.device_id + "'>" + oData.name + "</a>";
-                    }
-                },
-                {data: 'lastProtoDateTime', title: 'Last Update'},
-                {data: 'currentSleepTime', title: 'Next Action'},
-                {
-                    data: 'rmname', title: 'Route',
-                    "render": function (data, type, oData) {
-                        if (oData.rmname != 'Idle') {
-                            return "<a href='{{ url_for('settings_areas') }}?id=" + oData.area_id + "&mode=" + oData.mode + "'>" + oData.rmname + "</a>";
-                        } else {
-                            return 'Idle';
-                        }
-                    }
-                },
-                {data: 'routeMax', title: 'Route Length'},
-                {data: 'init', title: 'Init Mode'},
-                {data: 'restartCounter', title: 'Restart Counter'},
-                {data: 'globalrestartcount', title: 'Total Restarts'},
-                {data: 'lastPogoRestart', title: 'Last Restart'},
-                {data: 'rebootingOption', title: 'Reboot Device'},
-                {data: 'rebootCounter', title: 'Reboot Counter'},
-                {data: 'globalrebootcount', title: 'Total Reboots'},
-                {data: 'lastPogoReboot', title: 'Last Reboot'},
-                {
-                    data: null, orderable: false, className: "text-nowrap",
-                    "render": function (data, type, oData) {
-                        return "<center><button data-toggle='tooltip' title='Delete worker stats from database' type='button' class='delete btn btn-danger btn-sm confirm' data-deviceid='" + oData.device_id + "'><div class='delete_div' style='display:inline;'><i class='fa fa-trash'></i></div></button> <button type='button' data-toggle='tooltip' title='Reset workers stats' class=' reset btn btn-info btn-sm' data-deviceid='" + oData.device_id + "'><div class='delete_div' style='display:inline;'><i class='fas fa-undo'></i></i></div></button></center>";
+            {responsivePriority: 2, data: 'lastProtoDateTime', title: 'Last Update'},
+            {data: 'currentSleepTime', title: 'Next Action'},
+            {
+                responsivePriority: 3, data: 'rmname', title: 'Route',
+                "render": function (data, type, oData) {
+                    if (oData.rmname != 'Idle') {
+                        return "<a href='{{ url_for('settings_areas') }}?id=" + oData.area_id + "&mode=" + oData.mode + "'>" + oData.rmname + "</a>";
+                    } else {
+                        return 'Idle';
                     }
-                }            ],
-            "columnDefs": [
-                {
-                    "targets": [5, 9],
-                    "render": function (data, type, row) {
-                        return (parseInt(data) == 0 ? "False" : "True");
-                    }
-                },
-                {
-                    "targets": [4],
-                    "render": function (data, type, row) {
-                        return row.routePos + "/" + row.routeMax
+                }
+            },
+            {data: 'routeMax', title: 'Route Length'},
+            {data: 'init', title: 'Init Mode'},
+            {data: 'restartCounter', title: 'Restart Counter'},
+            {data: 'globalrestartcount', title: 'Total Restarts'},
+            {data: 'lastPogoRestart', title: 'Last Restart'},
+            {data: 'rebootingOption', title: 'Reboot Device'},
+            {data: 'rebootCounter', title: 'Reboot Counter'},
+            {data: 'globalrebootcount', title: 'Total Reboots'},
+            {data: 'lastPogoReboot', title: 'Last Reboot'},
+            {
+                responsivePriority: 4, data: null, orderable: false, className: "text-nowrap",
+                "render": function (data, type, oData) {
+                    return "<center><button data-toggle='tooltip' title='Delete worker stats from database' type='button' class='delete btn btn-danger btn-sm confirm' data-deviceid='" + oData.device_id + "'><div class='delete_div' style='display:inline;'><i class='fa fa-trash'></i></div></button> <button type='button' data-toggle='tooltip' title='Reset workers stats' class=' reset btn btn-info btn-sm' data-deviceid='" + oData.device_id + "'><div class='delete_div' style='display:inline;'><i class='fas fa-undo'></i></i></div></button></center>";
+                }
+            }],
+        "columnDefs": [
+            {
+                "targets": [5, 9],
+                "render": function (data, type, row) {
+                    return (parseInt(data) == 0 ? "False" : "True");
+                }
+            },
+            {
+                "targets": [4],
+                "render": function (data, type, row) {
+                    return row.routePos + "/" + row.routeMax
+                }
+            },
+            {
+                "targets": [1],
+                "render": function (data, type, row) {
+                    if (type == "sort") {
+                        return data;
                     }
-                },
-                {
-                    "targets": [1],
-                    "render": function (data, type, row) {
-                        if (type == "sort") { return data; }
-                        var dateToShow = moment.utc(data * 1000);
-                        if (dateToShow.isValid() && data != null && data != undefined) {
-                            return toHHMMSS_mark(Math.abs(dateToShow.diff(moment.utc()) / 1000));
-                        }
-                        return "None";
+                    var dateToShow = moment.utc(data * 1000);
+                    if (dateToShow.isValid() && data != null && data != undefined) {
+                        return toHHMMSS_mark(Math.abs(dateToShow.diff(moment.utc()) / 1000));
                     }
-                },
-                {
-                    "targets": [8, 12],
-                    "render": function (data, type, row) {
-                        if (type == "sort") { return data; }
-                        var dateToShow = moment.utc(data * 1000);
-                        if (dateToShow.isValid() && data != null && data != undefined && data > 0) {
-                            return toHHMMSS(Math.abs(dateToShow.diff(moment.utc()) / 1000));
-                        }
-                        return "None";
+                    return "None";
+                }
+            },
+            {
+                "targets": [8, 12],
+                "render": function (data, type, row) {
+                    if (type == "sort") {
+                        return data;
                     }
-                },
-                {
-                    "targets": [2],
-                    "render": function (data, type, row) {
-                        return toHHMMSS(data);
+                    var dateToShow = moment.utc(data * 1000);
+                    if (dateToShow.isValid() && data != null && data != undefined && data > 0) {
+                        return toHHMMSS(Math.abs(dateToShow.diff(moment.utc()) / 1000));
                     }
+                    return "None";
                 }
-            ],
-            "order": [[0, "asc"]],
-            "responsive": {{ responsive }},
-            "autoWidth": false,
-            "stateSave": true,
-            "stateDuration": 0
-        });
+            },
+            {
+                "targets": [2],
+                "render": function (data, type, row) {
+                    return toHHMMSS(data);
+                }
+            }
+        ],
+        "order": [[0, "asc"]],
+        "responsive": {
+            details: {
+                details: {
+                    display: $.fn.dataTable.Responsive.display.childRowImmediate,
+                    type: ''
+                }
+            }
+        },
+        "autoWidth": false,
+        "stateSave": true,
+        "stateDuration": 0
+    });
+
+        // Handle click on "Expand All" button
+    $('#btn-show-all-children').on('click', function(){
+        // Expand row details
+        dataTable.rows(':not(.parent)').nodes().to$().find('td:first-child').trigger('click');
+    });
+
+    // Handle click on "Collapse All" button
+    $('#btn-hide-all-children').on('click', function(){
+        // Collapse row details
+        dataTable.rows('.parent').nodes().to$().find('td:first-child').trigger('click');
+    });
 
     var toHHMMSS_mark = (secs) => {
         var sec_test = parseInt(secs, 10);
-        if (sec_test <  localStorage['MAD_MAXSECONDS_STATUS']) {
-                return "<i class='fas fa-check' style='color: green !important;'></i>";
+        if (sec_test < localStorage['MAD_MAXSECONDS_STATUS']) {
+            return "<i class='fas fa-check' style='color: green !important;'></i>";
         }
         return toHHMMSS(secs);
     }
 
     var toHHMMSS = (secs) => {
         var sec_num = parseInt(secs, 10)
-        var hours   = Math.floor(sec_num / 3600)
+        var hours = Math.floor(sec_num / 3600)
         var minutes = Math.floor(sec_num / 60) % 60
         var seconds = sec_num % 60
 
-        return [hours,minutes,seconds]
+        return [hours, minutes, seconds]
             .map(v => v < 10 ? "0" + v : v)
-            .filter((v,i) => v !== "00" || i > 0)
+            .filter((v, i) => v !== "00" || i > 0)
             .join(":")
     }
 
     $(document).ready(function () {
         $("#navstatus").addClass("active");
         $('input#maxSeconds').val(localStorage["MAD_MAXSECONDS_STATUS"]);
-        $('input#maxSeconds').on('input', function() {
-                localStorage['MAD_MAXSECONDS_STATUS'] = $(this).val();
+        $('input#maxSeconds').on('input', function () {
+            localStorage['MAD_MAXSECONDS_STATUS'] = $(this).val();
         });
 
         setInterval(function () {
-                dataTable.ajax.reload(null, false); //user paging is not reset on reload
+            dataTable.ajax.reload(null, false); //user paging is not reset on reload
         }, 10000);
     });
 
-    $( "#show-data-status" ).on( "click", 'button.delete', function(e) {
+    $("#show-data-status").on("click", 'button.delete', function (e) {
         e.stopImmediatePropagation();
         var r = confirm("You really want to delete this entry?");
         if (r != true) {
-             return;
+            return;
         }
         var delete_div = $(this).find(".delete_div");
 
         delete_div.empty();
         elem = $(document.createElement("img")).attr({
-                      'src': "{{ url_for('static', filename='loading.gif') }}",
-                      'class': 'convert_disp fa',
-                      'width': '13px',
-                      'heigth': '13px'
-                    });
+            'src': "{{ url_for('static', filename='loading.gif') }}",
+            'class': 'convert_disp fa',
+            'width': '13px',
+            'heigth': '13px'
+        });
         delete_div.append(elem);
         var deviceid = $(this).data('deviceid');
 
 
         $.ajax({
             type: 'GET',
-            url:'delete_status_entry',
-            data:'deviceid='+ deviceid,
-            success: function(msg){
-            if (msg.status == 'success') {
-                 dataTable.ajax.reload(null, false);
-            }
+            url: 'delete_status_entry',
+            data: 'deviceid=' + deviceid,
+            success: function (msg) {
+                if (msg.status == 'success') {
+                    dataTable.ajax.reload(null, false);
+                }
             },
-            error: function(msg) {
+            error: function (msg) {
                 alert(msg);
                 delete_div.empty();
                 elem = $(document.createElement("i")).attr({
-                      'class': 'fa fa-minus-circle',
+                    'class': 'fa fa-minus-circle',
                 });
                 delete_div.append(elem);
             }
         });
 
-     });
+    });
 
-     $( "#show-data-status" ).on( "click", 'button.reset', function(e) {
+    $("#show-data-status").on("click", 'button.reset', function (e) {
         e.stopImmediatePropagation();
         var r = confirm("You really want to reset the count values?");
         if (r != true) {
-             return;
+            return;
         }
         var delete_div = $(this).find(".delete_div");
 
         delete_div.empty();
         elem = $(document.createElement("img")).attr({
-                      'src': "{{ url_for('static', filename='loading.gif') }}",
-                      'class': 'convert_disp fa',
-                      'width': '13px',
-                      'heigth': '13px'
-                    });
+            'src': "{{ url_for('static', filename='loading.gif') }}",
+            'class': 'convert_disp fa',
+            'width': '13px',
+            'heigth': '13px'
+        });
         delete_div.append(elem);
         var deviceid = $(this).data('deviceid');
 
 
         $.ajax({
             type: 'GET',
-            url:'reset_status_entry',
-            data:'deviceid='+ deviceid,
-            success: function(msg){
-            if (msg.status == 'success') {
-                 dataTable.ajax.reload(null, false);
-            }
+            url: 'reset_status_entry',
+            data: 'deviceid=' + deviceid,
+            success: function (msg) {
+                if (msg.status == 'success') {
+                    dataTable.ajax.reload(null, false);
+                }
             },
-            error: function(msg) {
+            error: function (msg) {
                 alert(msg);
                 delete_div.empty();
                 elem = $(document.createElement("i")).attr({
-                      'class': 'fa fa-minus-circle',
+                    'class': 'fa fa-minus-circle',
                 });
                 delete_div.append(elem);
             }
         });
 
-     });
+    });
 
 </script>
 <style>
-   table.dataTable tr.odd { background-color: #F8F8F8; }
-   table.dataTable tr.even { background-color: white; }
+    table.dataTable tr.odd {
+        background-color: #F8F8F8;
+    }
+
+    table.dataTable tr.even {
+        background-color: white;
+    }
 </style>
 
 {% endblock %}
@@ -237,22 +265,28 @@
 <h2>Worker Status</h2>
 
 <div class="row">
-  <div class="col">
-    <div class="alert alert-primary">
-      View workers and their current status. Times are displayed as (HH):MM:SS.
+    <div class="col">
+        <div class="alert alert-primary">
+            View workers and their current status. Times are displayed as (HH):MM:SS.
+        </div>
     </div>
-  </div>
 </div>
 
+<div style="text-align: right;">
+    <button id="btn-show-all-children" class="btn btn-success btn-sm" type="button">Expand All</button>
+    <button id="btn-hide-all-children" class="btn btn-success btn-sm" type="button">Collapse All</button>
+</div>
+<br>
 <div class="row">
-  <div class="col">
-    <table id="show-data-status" class="table"></table>
-  </div>
+    <div class="col">
+        <table id="show-data-status" class="table"></table>
+    </div>
 </div>
-
+<br>
 <div class="row">
-  <div class="col">
-    Set maximum time in seconds to display "Last update" as <i class="fas fa-check" style="color: green !important;"></i> for an easier overview <input type="number" id="maxSeconds" />
-  </div>
+    <div class="col">
+        Set maximum time in seconds to display "Last update" as <i class="fas fa-check"
+                                                                   style="color: green !important;"></i> for an easier overview <input type="number" id="maxSeconds"/>
+    </div>
 </div>
 {% endblock %}