diff --git a/data/interfaces/default/css/dataTables.colVis.css b/data/interfaces/default/css/dataTables.colVis.css
index af854027..89d48d59 100644
--- a/data/interfaces/default/css/dataTables.colVis.css
+++ b/data/interfaces/default/css/dataTables.colVis.css
@@ -43,7 +43,7 @@ button.ColVis_Button {
     background-image: none;
     background-color: #444;
     border: 1px solid transparent;
-    border-radius: 14.5px;
+    border-radius: 3px;
     outline:0px !important;
     -webkit-appearance:none;
 }
diff --git a/data/interfaces/default/css/plexwatch.css b/data/interfaces/default/css/plexwatch.css
index 5999ec2a..8ad6620e 100644
--- a/data/interfaces/default/css/plexwatch.css
+++ b/data/interfaces/default/css/plexwatch.css
@@ -640,7 +640,7 @@ h3,
 h4,
 h5,
 h6 {
-	line-height: 24px;
+	line-height: 1.5em;
 }
 h1 {
 	font-size: 30px;
@@ -1254,7 +1254,7 @@ input[type="color"],
 	padding: 4px 6px;
 	margin-bottom: 10px;
 	font-size: 14px;
-	line-height: 20px;
+	line-height: 1.5em;
 	color: #555555;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
@@ -1289,10 +1289,10 @@ input[type="color"],
 	color: #fff;
 	border: 0px solid #444;
 	background: #555;
-	height: 24px;
-	padding: 2px 5px 2px 12px;
+	height: 22px;
+	padding: 6px 12px;
 	background-color: #555;
-	border-radius: 14.5px;
+	border-radius: 3px;
 	transition: background-color .3s;
 }
 textarea:focus,
@@ -8323,6 +8323,61 @@ ol.test >li {
     color: #444;
 }
 
+.squared {
+	padding: 4px 12px;
+    margin: 2px 2px 2px 0px;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1.42857143;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+      touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+    background-image: none;
+    background-color: #444;
+    border: 1px solid transparent;
+    border-radius: 3px;
+    outline:0px !important;
+    -webkit-appearance:none;
+}
+
+.squared:hover {
+    color: #F9AA03;
+}
+
+.squared:active {
+    border: 1px solid #eb8600;
+}
+
+.squared-primary {
+	background-color: #eb8600;
+	color: #f2f2f2;
+}
+
+.squared-primary:hover {
+	color: #fff;
+}
+
+.squared-primary:active {
+    border: 1px solid #444;
+    color: #444;
+}
+
+.squared-caps {
+	color: #f2f2f2;
+	font-size: 12px;
+	padding: 2px 8px;
+	text-transform: uppercase;
+	font-weight: bold;
+
+}
+
 .header-bar {
 	float: left;
 }
@@ -8336,7 +8391,7 @@ ol.test >li {
 }
 
 .settings-pane {
-	padding: 20px;
+	padding: 0px;
     margin-left: auto;
     margin-right: auto;
     margin-top: 20px;
@@ -8349,9 +8404,10 @@ ol.test >li {
 	.settings-pane-options-list {
 		float: left;
 		width: 25%;
+		max-width: 300px;
+		margin-right: 40px;
 	}
 	.settings-pane-content {
-		margin-left: 25%;
 		padding-left: 40px;
 	}
 }
@@ -8374,9 +8430,9 @@ ol.test >li {
 	display: block;
 	padding: 15px 15px 15px 15px;
 	color: #999;
-	-webkit-transition: all 0.4s ease;
-  	-o-transition: all 0.4s ease;
-  	transition: all 0.4s ease;
+	-webkit-transition: all 0.3s ease;
+  	-o-transition: all 0.3s ease;
+  	transition: all 0.3s ease;
 }
 
 .nav-settings > li > a:hover,
@@ -8411,9 +8467,9 @@ ol.test >li {
 	color: #eee;
 	border-left: 2px solid #444;
 	border-top: 1px solid #2d2d2d;
-	-webkit-transition: all 0.4s ease;
-  	-o-transition: all 0.4s ease;
-  	transition: all 0.4s ease;
+	-webkit-transition: all 0.3s ease;
+  	-o-transition: all 0.3s ease;
+  	transition: all 0.3s ease;
 }
 
 .stacked-configs > li > span:hover,
@@ -8460,9 +8516,9 @@ ol.test >li {
   color: #999;
   border-bottom: 1px solid #2d2d2d;
   position: relative;
-  -webkit-transition: all 0.4s ease;
-  -o-transition: all 0.4s ease;
-  transition: all 0.4s ease;
+  -webkit-transition: all 0.3s ease;
+  -o-transition: all 0.3s ease;
+  transition: all 0.3s ease;
 }
 
 .accordion li:last-child .link { border-bottom: 0; }
@@ -8472,9 +8528,9 @@ ol.test >li {
   top: 10px;
   left: 10px;
   color: #999;
-  -webkit-transition: all 0.4s ease;
-  -o-transition: all 0.4s ease;
-  transition: all 0.4s ease;
+  -webkit-transition: all 0.3s ease;
+  -o-transition: all 0.3s ease;
+  transition: all 0.3s ease;
 }
 
 .accordion li i.fa-chevron-down {
diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html
index f699d525..cb18f8e1 100644
--- a/data/interfaces/default/edit_user.html
+++ b/data/interfaces/default/edit_user.html
@@ -38,7 +38,7 @@ DOCUMENTATION :: END
 </div>
 <div class="modal-footer">
     <div>
-        <input type="button" id="save_user_name" class="rounded rounded-primary" value="Save">
+        <input type="button" id="save_user_name" class="squared squared-primary" value="Save">
         <span id="edit-user-status-message"></span>
     </div>
 </div>
diff --git a/data/interfaces/default/js/tables/plex_logs.js b/data/interfaces/default/js/tables/plex_logs.js
index f5e9a0dd..7cb3cf4b 100644
--- a/data/interfaces/default/js/tables/plex_logs.js
+++ b/data/interfaces/default/js/tables/plex_logs.js
@@ -9,7 +9,7 @@ var plex_log_table_options = {
     "language": {
                 "search":"Search: ",
                 "lengthMenu":"Show _MENU_ lines per page",
-                "emptyTable": "No log information available. Have you set your logs folder in the <a href='config'>settings</a>?",
+                "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)"},
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
index db5bef1d..d3d7d537 100644
--- a/data/interfaces/default/logs.html
+++ b/data/interfaces/default/logs.html
@@ -22,7 +22,7 @@ from plexpy import helpers
                     <h2><i class="fa fa-book"></i> Logs</h2>
                 </div>
                 <div class="button-bar">
-                    <button class="rounded" id="clear-logs"><i class="fa fa-trash-o"></i> Clear log</button>
+                    <button class="squared" id="clear-logs"><i class="fa fa-trash-o"></i> Clear log</button>
                 </div>
             </div>
             <div class='table-card-back'>
diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
index 14b9a193..8afb151e 100644
--- a/data/interfaces/default/notification_config.html
+++ b/data/interfaces/default/notification_config.html
@@ -33,7 +33,7 @@
 </div>
 <div class="modal-footer">
     <div class="">
-        <input type="button" id="save-notification-item" class="rounded rounded-primary" value="Save">
+        <input type="button" id="save-notification-item" class="squared squared-primary" value="Save">
     </div>
 </div>
 % endif
diff --git a/data/interfaces/default/plexwatch_import.html b/data/interfaces/default/plexwatch_import.html
index fad8c971..a5395b87 100644
--- a/data/interfaces/default/plexwatch_import.html
+++ b/data/interfaces/default/plexwatch_import.html
@@ -26,7 +26,7 @@
 </div>
 <div class="modal-footer">
     <div>
-        <input type="button" id="import_db" class="rounded rounded-primary" value="Import">
+        <input type="button" id="import_db" class="squared squared-primary" value="Import">
         <span id="status-message"></span>
     </div>
 </div>
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 05d28c58..21cb262d 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -14,19 +14,19 @@
 <div class="container-fluid">
     <div class='row-fluid'>
         <div class='span12'>
-            <div class='table-card-back'>
-                <div class="header-bar">
-                    <h2><i class="fa fa-cog"></i> Settings</h2>
-                </div>
-                <div class="button-bar">
-                    % if config['check_github']:
-                    <button id="menu_link_update_check" class="rounded"><i class="fa fa-arrow-circle-up"></i> Check for Updates</button>
-                    % endif
-                    <button id="menu_link_restart" class="rounded"><i class="fa fa-refresh"></i> Restart</button>
-                    <button id="menu_link_shutdown" class="rounded"><i class="fa fa-power-off"></i> Shut Down</button>
-                </div>
-            </div>
             <div class="settings-pane">
+                <div class='table-card-back' style="width: initial;">
+                    <div class="header-bar">
+                        <h2><i class="fa fa-cog"></i> Settings</h2>
+                    </div>
+                    <div class="button-bar">
+                        % if config['check_github']:
+                        <button id="menu_link_update_check" class="squared"><i class="fa fa-arrow-circle-up"></i> Check for Updates</button>
+                        % endif
+                        <button id="menu_link_restart" class="squared"><i class="fa fa-refresh"></i> Restart</button>
+                        <button id="menu_link_shutdown" class="squared"><i class="fa fa-power-off"></i> Shut Down</button>
+                    </div>
+                </div>
                 <div role="tabpanel" class="row-fluid">
                     <!-- Nav tabs -->
                     <div class="settings-pane-options-list">
@@ -73,7 +73,7 @@
                                         <p class="help-block">Set your preferred time format. <a href="#dateTimeOptionsModal" data-toggle="modal">Click here</a> to see the parameter list.</p>
                                     </div>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-2">
                                 <fieldset>
@@ -110,7 +110,7 @@
                                         </div>
                                     </div>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-3">
                                 <fieldset>
@@ -144,7 +144,7 @@
                                         <p class="help-block">Current API key: <strong><br/>${config['api_key']}</strong></p>
                                     </div>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-4">
                                 <fieldset>
@@ -172,7 +172,7 @@
                                     </div>
                                     <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-5">
                                 <fieldset>
@@ -200,7 +200,7 @@
                                         <p class="help-block">Refresh the user list when PlexPy starts.</p>
                                     </div>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-6">
                                 <div class="wellheader">
@@ -228,7 +228,7 @@
                                     </div>
                                     <p class="help-block"><a href="#plexwatch-import-modal" id="toggle-plexwatch-import-modal" data-toggle="modal">Click here to Import an existing Plexwatch database.</a></p>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-7">
                                 <fieldset>
@@ -271,7 +271,7 @@
                                         </p>
                                     </div>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-8">
                                 <fieldset>
@@ -363,7 +363,7 @@
                                       </li>
                                     </ul>
                                 </fieldset>
-                                <input type="button" class="rounded rounded-primary save-button" value="Save" data-success="Changes saved successfully">
+                                <input type="button" class="squared squared-primary save-button" value="Save" data-success="Changes saved successfully">
                             </div>
                             <div role="tabpanel" class="tab-pane" id="tabs-9">
                                 <fieldset>
@@ -551,7 +551,7 @@
                 </div>
                 <div class="modal-footer">
                     <div class="">
-                        <input type="button" id="get-pms-auth-token" class="rounded rounded-primary" value="Fetch Token">
+                        <input type="button" id="get-pms-auth-token" class="squared squared-primary" value="Fetch Token">
                         <span id="pms-token-status"></span>
                     </div>
                 </div>
@@ -701,6 +701,18 @@
 <script>
 $(document).ready(function() {
 
+    // Javascript to enable link to tab
+    var hash = document.location.hash;
+    var prefix = "tab_";
+    if (hash) {
+        $('.nav-settings a[href='+hash.replace(prefix,"")+']').tab('show');
+    }
+
+    // Change hash for page-reload
+    $('.nav-settings a').on('shown', function (e) {
+        window.location.hash = e.target.hash.replace("#", "#" + prefix);
+    });
+
     var configForm = $("#configUpdate");
     $('.save-button').click(function() {
         if ($("#pms_identifier").val() == "") {
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 0666ff91..e4472d29 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -16,7 +16,7 @@ from plexpy import helpers
                     <h2><i class="fa fa-group"></i> Active Users</h2>
                 </div>
                 <div class="button-bar">
-                    <button class="rounded" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
+                    <button class="squared" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
                 </div>
             </div>
             <div class='table-card-back'>