diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index adba1965..b9d56921 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -15,12 +15,13 @@ history_table_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "lengthMenu":"Show _MENU_ entries per page",
-        "info":"Showing _START_ to _END_ of _TOTAL_ history items",
-        "infoEmpty":"Showing 0 to 0 of 0 entries",
-        "infoFiltered":"<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table"
-    },
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ history items",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
+        "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+},
     "pagingType": "full_numbers",
     "stateSave": true,
     "processing": false,
diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js
index d2a827c5..bc436b93 100644
--- a/data/interfaces/default/js/tables/history_table_modal.js
+++ b/data/interfaces/default/js/tables/history_table_modal.js
@@ -14,10 +14,11 @@ history_table_modal_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "info":"Showing _START_ to _END_ of _TOTAL_ history items",
-        "infoEmpty":"Showing 0 to 0 of 0 entries",
-        "infoFiltered":"",
+        "info": "Showing _START_ to _END_ of _TOTAL_ history items",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "",
         "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "pagingType": "simple_numbers",
     "stateSave": false,
diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index e87b78fb..ac9db763 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -4,11 +4,12 @@ var libraries_to_purge = [];
 libraries_list_table_options = {
     "language": {
         "search": "Search: ",
-        "lengthMenu":"Show _MENU_ entries per page",
-        "info":"Showing _START_ to _END_ of _TOTAL_ active libraries",
-        "infoEmpty":"Showing 0 to 0 of 0 entries",
-        "infoFiltered":"",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ active libraries",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "",
         "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "destroy": true,
     "processing": false,
diff --git a/data/interfaces/default/js/tables/logs.js b/data/interfaces/default/js/tables/logs.js
index 532176b9..a14b2dbd 100644
--- a/data/interfaces/default/js/tables/logs.js
+++ b/data/interfaces/default/js/tables/logs.js
@@ -8,11 +8,13 @@ var log_table_options = {
     "stateSave": true,
     "language": {
                 "search":"Search: ",
-                "lengthMenu":"Show _MENU_ lines per page",
+                "lengthMenu": "Show _MENU_ lines per page",
                 "emptyTable": "No log information available",
-                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty":"Showing 0 to 0 of 0 lines",
-                "infoFiltered":"(filtered from _MAX_ total lines)"},
+                "info": "Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty": "Showing 0 to 0 of 0 lines",
+                "infoFiltered": "(filtered from _MAX_ total lines)",
+                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
     "columnDefs": [
         {
             "targets": [0],
diff --git a/data/interfaces/default/js/tables/media_info_table.js b/data/interfaces/default/js/tables/media_info_table.js
index 72d43d8b..215c522b 100644
--- a/data/interfaces/default/js/tables/media_info_table.js
+++ b/data/interfaces/default/js/tables/media_info_table.js
@@ -20,7 +20,8 @@ media_info_table_options = {
         "info":"Showing _START_ to _END_ of _TOTAL_ library items",
         "infoEmpty":"Showing 0 to 0 of 0 entries",
         "infoFiltered":"<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table"
+        "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "pagingType": "full_numbers",
     "stateSave": true,
diff --git a/data/interfaces/default/js/tables/notification_logs.js b/data/interfaces/default/js/tables/notification_logs.js
index 86c7b3bd..f79d8ccc 100644
--- a/data/interfaces/default/js/tables/notification_logs.js
+++ b/data/interfaces/default/js/tables/notification_logs.js
@@ -8,11 +8,13 @@ notification_log_table_options = {
     "stateSave": true,
     "language": {
                 "search":"Search: ",
-                "lengthMenu":"Show _MENU_ lines per page",
+                "lengthMenu": "Show _MENU_ lines per page",
                 "emptyTable": "No log information available",
-                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty":"Showing 0 to 0 of 0 lines",
-                "infoFiltered":"(filtered from _MAX_ total lines)"},
+                "info" :"Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty": "Showing 0 to 0 of 0 lines",
+                "infoFiltered": "(filtered from _MAX_ total lines)",
+                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
     "columnDefs": [
         {
             "targets": [0],
diff --git a/data/interfaces/default/js/tables/plex_logs.js b/data/interfaces/default/js/tables/plex_logs.js
index 4181e532..23fa7fc1 100644
--- a/data/interfaces/default/js/tables/plex_logs.js
+++ b/data/interfaces/default/js/tables/plex_logs.js
@@ -7,12 +7,14 @@ var plex_log_table_options = {
     "pageLength": 50,
     "stateSave": true,
     "language": {
-                "search":"Search: ",
-                "lengthMenu":"Show _MENU_ lines per page",
+                "search": "Search: ",
+                "lengthMenu": "Show _MENU_ lines per page",
                 "emptyTable": "No log information available. Have you set your logs folder in the <a href='settings'>settings</a>?",
-                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty":"Showing 0 to 0 of 0 lines",
-                "infoFiltered":"(filtered from _MAX_ total lines)"},
+                "info": "Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty": "Showing 0 to 0 of 0 lines",
+                "infoFiltered": "(filtered from _MAX_ total lines)",
+                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
     "columnDefs": [
         {
             "targets": [0],
diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js
index 5c348d52..54632d0c 100644
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -6,13 +6,13 @@ sync_table_options = {
     "pageLength": 25,
     "stateSave": true,
     "language": {
-        "search":"Search: ",
-        "lengthMenu":"Show _MENU_ lines per page",
+        "search": "Search: ",
+        "lengthMenu": "Show _MENU_ lines per page",
         "emptyTable": "No synced items",
-        "info":"Showing _START_ to _END_ of _TOTAL_ lines",
-        "infoEmpty":"Showing 0 to 0 of 0 lines",
-        "infoFiltered":"(filtered from _MAX_ total lines)",
-        "loadingRecords":'<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+        "info": "Showing _START_ to _END_ of _TOTAL_ lines",
+        "infoEmpty": "Showing 0 to 0 of 0 lines",
+        "infoFiltered": "(filtered from _MAX_ total lines)",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "columnDefs": [
         {
@@ -118,6 +118,12 @@ sync_table_options = {
     ],
     "drawCallback": function (settings) {
         // Jump to top of page
-        $('html,body').scrollTop(0);
+        // $('html,body').scrollTop(0);
+
+        $('#ajaxMsg').fadeOut();
+    },
+    "preDrawCallback": function (settings) {
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
+        showMsg(msg, false, false, 0)
     }
 }
diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js
index ba41200e..0b7c6059 100644
--- a/data/interfaces/default/js/tables/user_ips.js
+++ b/data/interfaces/default/js/tables/user_ips.js
@@ -2,11 +2,12 @@ user_ip_table_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "lengthMenu":"Show _MENU_ entries per page",
-        "info":"Showing _START_ to _END_ of _TOTAL_ results",
-        "infoEmpty":"Showing 0 to 0 of 0 entries",
-        "infoFiltered":"(filtered from _MAX_ total entries)",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ results",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "(filtered from _MAX_ total entries)",
         "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "stateSave": true,
     "pagingType": "full_numbers",
@@ -38,7 +39,8 @@ user_ip_table_options = {
                             $(td).html('n/a');
                         }
                     } else {
-                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="fa fa-map-marker"></i></span>&nbsp' + cellData +'</a>');
+                        external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
+                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
                     }
                 } else {
                     $(td).html('n/a');
@@ -125,9 +127,10 @@ user_ip_table_options = {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
-        $('.transcode-tooltip').tooltip();
-        $('.media-type-tooltip').tooltip();
-        $('.watched-tooltip').tooltip();
+        $('.external-ip-tooltip').tooltip({ container: 'body' });
+        $('.transcode-tooltip').tooltip({ container: 'body' });
+        $('.media-type-tooltip').tooltip({ container: 'body' });
+        $('.watched-tooltip').tooltip({ container: 'body' });
         $('.thumb-tooltip').popover({
             html: true,
             container: 'body',
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index e2469d4d..14028485 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -21,11 +21,12 @@ function toggleEditNames() {
 users_list_table_options = {
     "language": {
         "search": "Search: ",
-        "lengthMenu":"Show _MENU_ entries per page",
-        "info":"Showing _START_ to _END_ of _TOTAL_ active users",
-        "infoEmpty":"Showing 0 to 0 of 0 entries",
-        "infoFiltered":"",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ active users",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "",
         "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "destroy": true,
     "processing": false,
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index b797426f..282d838f 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -176,7 +176,7 @@ DOCUMENTATION :: END
                                     <div class='table-card-header'>
                                         <div class="header-bar">
                                             <span>
-                                                <i class="fa fa-history"></i> Watch History for <strong>
+                                                <i class="fa fa-history"></i> Play History for <strong>
                                                     <span class="set-username">${data['section_name']}</span>
                                                 </strong>
                                             </span>
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 59315e20..97479b14 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -175,7 +175,7 @@ DOCUMENTATION :: END
                                     <div class='table-card-header'>
                                         <div class="header-bar">
                                             <span>
-                                                <i class="fa fa-history"></i> Watch History for <strong>
+                                                <i class="fa fa-history"></i> Play History for <strong>
                                                     <span class="set-username">${data['friendly_name']}</span>
                                                 </strong>
                                             </span>