diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index f6271807..011d4569 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -1026,11 +1026,10 @@ input[type="color"],
 }
 .user-info-wrapper {
 	height: 113px;
-	margin-left: 15px;
-	margin-top: 30px;
 }
 .user-info-poster-face {
 	float: left;
+	margin-top: 15px;
 }
 .user-info-poster-face img {
 	bottom: 0;
@@ -1277,6 +1276,18 @@ input[type="color"],
     width: 90%;
     overflow: hidden;
 }
+.table-card-header {
+    padding: 16px 16px 16px 16px;
+    background-color: #2c2c2c;
+    border-bottom: 1px solid #3d3d3d;
+    border-top: 1px solid #282828;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 20px;
+    margin-bottom: -20px;
+    width: 90%;
+    overflow: hidden;
+}
 .table-card-back td {
 	font-size: 12px;
 }
diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index a9f27718..bb925072 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -7,7 +7,7 @@
 
 <%def name="body()">
 <div class="container-fluid">
-    <div class='table-card-back'>
+    <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-bar-chart"></i> Graphs</span>
         </div>
@@ -413,7 +413,7 @@
                 success: function(data) {
                     var dateArray = [];
                     for (var i = 0; i < data.categories.length; i++) {
-                        dateArray.push(moment(data.categories[i], 'YYYY-MM').valueOf());
+                        dateArray.push(moment(data.categories[i], 'YYYY-MM').format('MMM YYYY'));
                     }
                     hc_plays_by_month_options.yAxis.min = 0;
                     hc_plays_by_month_options.xAxis.categories = dateArray;
diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index 69ccfdcf..202917c1 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -9,7 +9,7 @@
 <%def name="body()">
 
 <div class='container-fluid'>
-    <div class='table-card-back'>
+    <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-history"></i> History</span>
         </div>
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 3d5661e0..6cc695c3 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -162,7 +162,7 @@ DOCUMENTATION :: END
 <div class='container-fluid'>
     <div class='row'>
         <div class='col-md-12'>
-            <div class='table-card-back'>
+            <div class='table-card-header'>
                 <div class="header-bar">
                     <span>Watch history for <strong>${data['title']}</strong></span>
                 </div>
diff --git a/data/interfaces/default/ip_address_modal.html b/data/interfaces/default/ip_address_modal.html
index de95651a..04761f5f 100644
--- a/data/interfaces/default/ip_address_modal.html
+++ b/data/interfaces/default/ip_address_modal.html
@@ -33,7 +33,9 @@
                 </ul>
             </div>
         </div>
-        <div class="modal-footer"></div>
+        <div class="modal-footer">
+            <span class="text-muted">Service provided by ip.api.com.</span>
+        </div>
     </div>
 </div>
 
@@ -50,7 +52,7 @@
                 $('#modal_header_ip_address').html("Request failed. Server may be too busy.");
             },
             success: function(data) {
-                $('#modal_header_ip_address').html("IP Address: " + ip_address);
+                $('#modal_header_ip_address').html('<i class="fa fa-map-marker"></i> IP Address: ' + ip_address);
                 $('#country').html(data.country);
                 $('#city').html(data.city);
                 $('#region').html(data.regionName);
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
index 20f0a5b4..51301fc2 100644
--- a/data/interfaces/default/logs.html
+++ b/data/interfaces/default/logs.html
@@ -16,7 +16,7 @@ from plexpy import helpers
 
 <%def name="body()">
 <div class='container-fluid'>
-    <div class='table-card-back'>
+    <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-book"></i> Logs</span>
         </div>
diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html
index 7aabe84f..80817af5 100644
--- a/data/interfaces/default/sync.html
+++ b/data/interfaces/default/sync.html
@@ -14,7 +14,7 @@
 
 <%def name="body()">
 <div class='container-fluid'>
-    <div class='table-card-back'>
+    <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-cloud-download"></i> Synced Items</span>
         </div>
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 45c34cd2..92ca4573 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -38,20 +38,22 @@ from plexpy import helpers
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-12">
-            <div class="user-info-wrapper">
-                <div class="user-info-poster-face" id="user-gravatar">
-                    <img src="${data['thumb']}" height="80px" width="80px">
-                </div>
-                <div class="user-info-username">
-                    <span class="set-username">${data['friendly_name']}</span> <a href="#" data-toggle="modal" data-target="#edit-user-modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a>
-                </div>
-                <div class="user-info-nav">
-                    <ul class="user-info-nav">
-                        <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
-                        <li><a id="ip-tab-btn" href="#userAddresses" data-toggle="tab">IP Addresses</a></li>
-                        <li><a id="history-tab-btn" href="#userHistory" data-toggle="tab">History</a></li>
-                        <li><a id="sync-tab-btn" href="#userSyncItems" data-toggle="tab">Synced Items</a></li>
-                    </ul>
+            <div class="table-card-back">
+                <div class="user-info-wrapper">
+                    <div class="user-info-poster-face" id="user-gravatar">
+                        <img src="${data['thumb']}" height="80px" width="80px">
+                    </div>
+                    <div class="user-info-username">
+                        <span class="set-username">${data['friendly_name']}</span> <span id="edit-user-tooltip" data-target="tooltip" title="Edit user details"><a href="#" data-toggle="modal" data-target="#edit-user-modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a></span>
+                    </div>
+                    <div class="user-info-nav">
+                        <ul class="user-info-nav">
+                            <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
+                            <li><a id="ip-tab-btn" href="#userAddresses" data-toggle="tab">IP Addresses</a></li>
+                            <li><a id="history-tab-btn" href="#userHistory" data-toggle="tab">History</a></li>
+                            <li><a id="sync-tab-btn" href="#userSyncItems" data-toggle="tab">Synced Items</a></li>
+                        </ul>
+                    </div>
                 </div>
             </div>
         </div>
@@ -65,12 +67,16 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="padded-header">
-                        <h3>Global Stats</h3>
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-line-chart"></i> Global Stats</span>
+                        </div>
                     </div>
-                    <div id="user-time-stats" class="user-overview-stats-wrapper">
-                        <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                        <br>
+                    <div class="table-card-back">
+                        <div id="user-time-stats" class="user-overview-stats-wrapper">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -78,12 +84,16 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="padded-header">
-                        <h3>Platform Stats</h3>
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-television"></i> Platform Stats</span>
+                        </div>
                     </div>
-                    <div id="user-platform-stats" class="user-platforms">
-                        <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                        <br>
+                    <div class="table-card-back">
+                        <div id="user-platform-stats" class="user-platforms">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -91,12 +101,16 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="padded-header">
-                        <h3>Recently watched</h3>
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-history"></i> Recently watched</span>
+                        </div>
                     </div>
-                    <div id="user-recently-watched">
-                        <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                        <br>
+                    <div class="table-card-back">
+                        <div id="user-recently-watched">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -106,9 +120,9 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="table-card-back">
+                    <div class="table-card-header">
                         <div class="header-bar">
-                            <span>IP Addresses for <strong>
+                            <span><i class="fa fa-map-marker"></i> IP Addresses for <strong>
                                 <span class="set-username">${data['friendly_name']}</span>
                             </strong></span>
                         </div>
@@ -136,9 +150,9 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class='table-card-back'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
-                            <span>Watch History for <strong>
+                            <span><i class="fa fa-history"></i> Watch History for <strong>
                                 <span class="set-username">${data['friendly_name']}</span>
                             </strong></span>
                         </div>
@@ -174,9 +188,9 @@ from plexpy import helpers
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-12">
-                    <div class='table-card-back'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
-                            <span>Synced Items for <strong>
+                            <span><i class="fa fa-cloud-download"></i> Synced Items for <strong>
                                 <span class="set-username">${data['friendly_name']}</span>
                             </strong></span>
                         </div>
@@ -230,6 +244,8 @@ from plexpy import helpers
             var user_id = null;
         % endif
 
+        $("#edit-user-tooltip").tooltip();
+
         // Populate watch time stats
         $.ajax({
             url: 'get_user_watch_time_stats',
@@ -312,6 +328,7 @@ from plexpy import helpers
 
         // Load edit user modal
         $("#toggle-edit-user-modal").click(function() {
+            $("#edit-user-tooltip").tooltip('hide');
             $.ajax({
                 url: 'edit_user_dialog',
                 data: { user_id: user_id, user: '${data['username']}' },
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index f6f90d6c..585df127 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -7,7 +7,7 @@
 
 <%def name="body()">
 <div class='container-fluid'>
-    <div class='table-card-back'>
+    <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-group"></i> Active Users</span>
         </div>