diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index e57b2ce2e1..a8df63029a 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -81,7 +81,7 @@
                     </div>
                 </form>
 
-                <div data-role="popup" class="ui-content" id="supporterPlugins">
+                <div data-role="popup" class="ui-content" id="supporterPlugins" style="max-width: 250px;">
                     <a href="#" data-rel="back" data-role="button" data-theme="b" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
                     <p>Supporter-Only plug-ins are free for anyone who is an <strong>MB3 Supporter</strong> (with a valid MB3 key who has donated the minimum amount to the overall project).</p>
                     <p>
@@ -89,7 +89,7 @@
                     <p>These plug-ins will appear in the catalog with a "Supporter" banner.</p>
                 </div>
 
-                <div data-role="popup" class="ui-content" id="premiumPlugins">
+                <div data-role="popup" class="ui-content" id="premiumPlugins" style="max-width: 250px;">
                     <a href="#" data-rel="back" data-role="button" data-theme="b" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
                     <p>
                         Premium plug-ins are developed by third-parties and require that you be an <strong>MB3 Supporter <em>and</em> also register the plug-in with its creator.</strong>
diff --git a/dashboard-ui/allusersettings.html b/dashboard-ui/allusersettings.html
index de366aba69..6b40fe82fe 100644
--- a/dashboard-ui/allusersettings.html
+++ b/dashboard-ui/allusersettings.html
@@ -1,7 +1,7 @@
 ﻿<!DOCTYPE html>
 <html>
 <head>
-    <title>User Profiles</title>
+    <title>Users</title>
 </head>
 <body>
     <div id="allUserSettingsPage" data-role="page" class="page type-interior userProfilesConfigurationPage">
@@ -9,8 +9,8 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="userprofiles.html" data-role="button">Users</a>
-                    <a href="allusersettings.html" class="ui-btn-active" data-role="button">Settings</a>
+                    <a href="userprofiles.html" data-role="button">Profiles</a>
+                    <a href="allusersettings.html" class="ui-btn-active" data-role="button">Security</a>
                 </div>
 
 
diff --git a/dashboard-ui/clientsettings.html b/dashboard-ui/appsplayback.html
similarity index 63%
rename from dashboard-ui/clientsettings.html
rename to dashboard-ui/appsplayback.html
index b932ed59c3..2ccb3e23a6 100644
--- a/dashboard-ui/clientsettings.html
+++ b/dashboard-ui/appsplayback.html
@@ -1,42 +1,32 @@
 ﻿<!DOCTYPE html>
 <html>
 <head>
-    <title>Client Settings</title>
+    <title>App Settings</title>
 </head>
 <body>
-    <div id="clientSettingsPage" data-role="page" class="page type-interior">
+    <div id="appsPlaybackPage" data-role="page" class="page appsPage type-interior">
 
         <div data-role="content">
             <div class="content-primary">
-                <form id="clientSettingsForm">
+                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                    <a href="appsplayback.html" data-role="button" class="ui-btn-active">Playback</a>
+                    <a href="appsweather.html" data-role="button">Weather</a>
+                </div>
+                <form class="appsPlaybackForm">
 
                     <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="txtWeatherLocation">Weather location: </label>
-                            <input id="txtWeatherLocation" name="txtWeatherLocation" type="text" />
-                            <div class="fieldDescription">
-                                US zip code / City, State, Country / City, Country
-                            </div>
-                        </li>
-                        <li>
-                            <label for="selectWeatherUnit">Weather display unit: </label>
-                            <select id="selectWeatherUnit" name="selectWeatherUnit">
-                                <option value="Celsius">Celsius</option>
-                                <option value="Fahrenheit">Fahrenheit</option>
-                            </select>
-                        </li>
                         <li>
                             <label for="txtMinResumePct">Min resume percentage: </label>
                             <input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required="required" min="0" max="100" />
                             <div class="fieldDescription">
-                                Titles are assumed unplayed before this time
+                                Titles are assumed unplayed if stopped before this time
                             </div>
                         </li>
                         <li>
                             <label for="txtMaxResumePct">Max resume percentage: </label>
                             <input type="number" id="txtMaxResumePct" name="txtMaxResumePct" pattern="[0-9]*" required="required" min="1" max="100" />
                             <div class="fieldDescription">
-                                Titles are assumed fully played after this time
+                                Titles are assumed fully played if stopped after this time
                             </div>
                         </li>
                         <li>
@@ -61,9 +51,7 @@
         </div>
 
         <script type="text/javascript">
-            $(function () {
-                $('#clientSettingsForm').on('submit', ClientSettingsPage.onSubmit);
-            });
+            $('.appsPlaybackForm').off('submit', AppsPlaybackPage.onSubmit).on('submit', AppsPlaybackPage.onSubmit);
         </script>
     </div>
 </body>
diff --git a/dashboard-ui/appsweather.html b/dashboard-ui/appsweather.html
new file mode 100644
index 0000000000..1ecc207f86
--- /dev/null
+++ b/dashboard-ui/appsweather.html
@@ -0,0 +1,51 @@
+﻿<!DOCTYPE html>
+<html>
+<head>
+    <title>App Settings</title>
+</head>
+<body>
+    <div id="appsWeatherPage" data-role="page" class="page appsPage type-interior">
+
+        <div data-role="content">
+            <div class="content-primary">
+                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                    <a href="appsplayback.html" data-role="button">Playback</a>
+                    <a href="appsweather.html" data-role="button" class="ui-btn-active">Weather</a>
+                </div>
+                <form class="appsWeatherForm">
+
+                    <ul data-role="listview" class="ulForm">
+                        <li>
+                            <label for="txtWeatherLocation">Weather display location: </label>
+                            <input id="txtWeatherLocation" name="txtWeatherLocation" type="text" />
+                            <div class="fieldDescription">
+                                US zip code / City, State, Country / City, Country
+                            </div>
+                        </li>
+                        <li>
+                            <label for="selectWeatherUnit">Weather display unit: </label>
+                            <select id="selectWeatherUnit" name="selectWeatherUnit">
+                                <option value="Celsius">Celsius</option>
+                                <option value="Fahrenheit">Fahrenheit</option>
+                            </select>
+                        </li>
+                        <li>
+                            <button type="submit" data-theme="b" data-icon="check">
+                                Save
+                            </button>
+                            <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
+                                Cancel
+                            </button>
+                        </li>
+                    </ul>
+
+                </form>
+            </div>
+        </div>
+
+        <script type="text/javascript">
+            $('.appsWeatherForm').off('submit', AppsWeatherPage.onSubmit).on('submit', AppsWeatherPage.onSubmit);
+        </script>
+    </div>
+</body>
+</html>
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 2cc02de8f4..03dd65068c 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -59,7 +59,7 @@ h1 {
 }
 
 .toolsSidebar h1 {
-    font-size: 42pt;
+    font-size: 36pt;
 }
 
 .ui-loader h1 {
@@ -157,7 +157,7 @@ pre, textarea.pre {
 }
 
 .header .imageLink img {
-    height: 32px;
+    height: 28px;
     vertical-align: middle;
 }
 
@@ -265,7 +265,7 @@ form, .readOnlyContent {
 
 .sidebarLinks a {
     display: block;
-    padding: 12px 15px 12px 30px;
+    padding: 12px 20px 12px 30px;
     text-decoration: none;
     color: #fff!important;
     text-shadow: none!important;
@@ -283,6 +283,12 @@ form, .readOnlyContent {
         color: #fff!important;
     }
 
+.sidebarDivider {
+    height: 1px;
+    background: #444;
+    margin: .25em 0;
+}
+
 .invalidEntry {
     background-color: lightpink!important;
 }
@@ -579,7 +585,7 @@ form, .readOnlyContent {
     max-width: 800px;
     padding: .5em 2em 1em;
     margin: 0 auto;
-    background: #f2f2f2;
+    background: #e8e8e8;
 }
 
 .wizardNavigation {
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 9645f235d1..21e09438c2 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -33,6 +33,11 @@
                             <div id="updateFail" style="color: #cc0000; display: none;">There was an error connecting to the remote Media Browser repository.</div>
                             <p id="ports"></p>
                             <div id="pPluginUpdates"></div>
+
+                            <div style="margin-top: 1em;">
+                                <button class="btnRestartContainer hide" id="btnRestartServer" type="button" data-icon="refresh" data-mini="true" data-inline="true" onclick="DashboardPage.restart();">Restart</button>
+                                <button id="btnShutdown" type="button" data-icon="delete" data-mini="true" data-inline="true" onclick="DashboardPage.shutdown();">Shutdown</button>
+                            </div>
                         </div>
                     </div>
 
@@ -62,18 +67,7 @@
                         <p><a href="scheduledtasks.html">Manage Scheduled Tasks</a></p>
                     </div>
 
-                    <div style="margin-top: 2em;">
-                        <div style="display: inline-block;">
-                            <div class="btnRestartContainer hide">
-                                <button id="btnRestartServer" type="button" data-icon="refresh" data-mini="true" data-inline="true" onclick="DashboardPage.restart();">Restart MB Server</button>
-                            </div>
-                        </div>
-                        <div style="display: inline-block;">
-                            <button id="btnShutdown" type="button" data-icon="delete" data-mini="true" data-inline="true" onclick="DashboardPage.shutdown();">Shutdown MB Server</button>
-                        </div>
-                    </div>
-
-                    <div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;">
+                    <div data-role="collapsible" data-collapsed="true" style="margin-top: 1em;">
                         <h3>Links</h3>
                         <div>
                             <p><a href="http://mediabrowser3.com/community" target="_blank">Community</a></p>
@@ -83,7 +77,7 @@
                         </div>
                     </div>
 
-                    <div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;">
+                    <div data-role="collapsible" data-collapsed="true" style="margin-top: 1em;">
                         <h3>System Paths</h3>
                         <div>
                             <p><b>Logs:</b> <span id="logPath"></span></p>
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 2906191d65..8c2480bdb8 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -340,7 +340,7 @@
                             <h3>Genres</h3>
                             <div data-role="editableListviewContainer">
                                 <div data-role="fieldcontain">
-                                    <div style="display: inline-block; width: 92%;">
+                                    <div style="display: inline-block; width: 80%;">
                                         <input type="text" data-mini="true" />
                                     </div>
                                     <a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">Add</a>
@@ -352,7 +352,7 @@
                             <h3>Studios</h3>
                             <div data-role="editableListviewContainer">
                                 <div data-role="fieldcontain">
-                                    <div style="display: inline-block; width: 92%;">
+                                    <div style="display: inline-block; width: 80%;">
                                         <input type="text" data-mini="true" />
                                     </div>
                                     <a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">Add</a>
@@ -364,7 +364,7 @@
                             <h3>Tags</h3>
                             <div data-role="editableListviewContainer">
                                 <div data-role="fieldcontain">
-                                    <div style="display: inline-block; width: 92%;">
+                                    <div style="display: inline-block; width: 80%;">
                                         <input type="text" data-mini="true" />
                                     </div>
                                     <a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">Add</a>
diff --git a/dashboard-ui/edituser.html b/dashboard-ui/edituser.html
index 946942bacd..8ca68f3dae 100644
--- a/dashboard-ui/edituser.html
+++ b/dashboard-ui/edituser.html
@@ -13,7 +13,6 @@
                     <a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
                 </div>
                 <form id="editUserProfileForm">
                     <ul data-role="listview" class="ulForm">
@@ -27,7 +26,7 @@
                         </li>
                         <li id="fldEnableRemoteControlOtherUsers" style="display: none;">
                             <input type="checkbox" id="chkEnableRemoteControlOtherUsers" name="chkEnableRemoteControlOtherUsers" />
-                            <label for="chkEnableRemoteControlOtherUsers">Allow this user to remote control sessions from other users</label>
+                            <label for="chkEnableRemoteControlOtherUsers">Allow this user to remote control other users</label>
                         </li>
                     </ul>
                     <div id="accessControlDiv" style="display: none">
@@ -48,12 +47,12 @@
                         <h2>Parental Control</h2>
                         <ul data-role="listview" class="ulForm">
                             <li id="fldMaxParentalRating">
-                                <label for="selectMaxParentalRating">Max parental rating:</label>
+                                <label for="selectMaxParentalRating">Maximum allowed parental rating:</label>
                                 <select name="selectMaxParentalRating" id="selectMaxParentalRating"></select>
                             </li>
                             <li id="fldBlockNotRated">
                                 <input type="checkbox" id="chkBlockNotRated" name="chkBlockNotRated" />
-                                <label for="chkBlockNotRated">Block items with no rating information</label>
+                                <label for="chkBlockNotRated">Hide content with no rating information</label>
                             </li>
                         </ul>
                     </div>
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 16fc8186a7..eb46fe7507 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -8,32 +8,27 @@
 
         <div data-role="content">
             <div class="content-primary">
-                <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('edituser.html', true);">Profile</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
-                    <a href="#" data-role="button" class="ui-btn-active">Media Library</a>
-                </div>
-                <div data-role="controlgroup" data-type="horizontal" class="localnav" id="defaultNavigation" style="display: none;" data-mini="true">
-                    <a href="#" data-role="button" class="ui-btn-active">Media Collections</a>
+                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                    <a href="#" data-role="button" class="ui-btn-active">Media</a>
                     <a href="librarysettings.html" data-role="button">Settings</a>
                 </div>
                 <div class="readOnlyContent">
+                    <p>
+                        <label for="selectUser">Manage user library: </label>
+                        <select id="selectUser" class="selectUser" data-mini="true"></select>
+                    </p>
                     <p id="fldUseDefaultLibrary" style="display: none;">
                         <input type="checkbox" id="chkUseDefaultLibrary" name="chkUseDefaultLibrary" onchange="MediaLibraryPage.setUseDefaultMediaLibrary(this.checked);" />
                         <label for="chkUseDefaultLibrary">Use default media library</label>
                     </p>
+                    <p style="margin: 2em 0;">Refer to the <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a> for suggested folder structures.</p>
                     <div id="divMediaLibrary">
-                        <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless individual libraries are created.</p>
                         <p>
                             <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
                         </p>
                         <div id="divVirtualFolders"></div>
                     </div>
                 </div>
-                <p>Refer to <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a></p>
-                <p>Configure <b>images</b> and <b>sort orders</b> by <a href="itemlist.html">browsing and editing.</a></p>
             </div>
         </div>
         <div data-role="popup" id="popupEnterText" class="popup">
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 187d3083a7..832619a4de 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -9,7 +9,7 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="library.html" data-role="button">Collections</a>
+                    <a href="library.html" data-role="button">Media</a>
                     <a href="#" data-role="button" class="ui-btn-active">Settings</a>
                 </div>
 
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 2674143021..f8324ff213 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -24,7 +24,8 @@
                         </li>
                         <li>
                             <input type="checkbox" id="chkSaveLocal" name="chkSaveLocal" data-mini="true" />
-                            <label for="chkSaveLocal">Save metadata within media folders </label>
+                            <label for="chkSaveLocal">Save metadata and images within media folders </label>
+                            <div class="fieldDescription">Save downloaded metadata and images into media folders where they can be stored permanently and easily edited.</div>
                         </li>
                         <li>
                             <label for="selectLanguage">Preferred language: </label>
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index 581c9bd349..fdf7866e7d 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -10,7 +10,7 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                     <a href="plugins.html" data-role="button">Installed Plugins</a>
-                    <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
+                    <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Catalog</a>
                     <a href="pluginupdates.html" data-role="button">Updates</a>
                 </div>
                 <p style="margin: 2em 0;">
@@ -45,13 +45,13 @@
             </div>
         </div>
 
-        <div data-role="popup" class="ui-content" id="freePlugins" style="max-width: 50%">
+        <div data-role="popup" class="ui-content" id="freePlugins" style="max-width: 250px;">
             <a href="#" data-rel="back" data-role="button" data-theme="b" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
             <p>
                 Free plug-ins can be installed and used by anyone for free. They will appear in the catalog without any banners.<p>
         </div>
 
-        <div data-role="popup" class="ui-content" id="supporterPlugins" style="max-width: 50%">
+        <div data-role="popup" class="ui-content" id="supporterPlugins" style="max-width: 250px;">
             <a href="#" data-rel="back" data-role="button" data-theme="b" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
             <p>Supporter-Only plug-ins are free for anyone who is an <strong>MB3 Supporter</strong> (with a valid MB3 key who has donated the minimum amount to the overall project).</p>
             <p>
@@ -59,7 +59,7 @@
             <p>These plug-ins will appear in the catalog with a "Supporter" banner.</p>
         </div>
 
-        <div data-role="popup" class="ui-content" id="premiumPlugins" style="max-width: 50%">
+        <div data-role="popup" class="ui-content" id="premiumPlugins" style="max-width: 250px;">
             <a href="#" data-rel="back" data-role="button" data-theme="b" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
             <p>
                 Premium plug-ins are developed by third-parties and require that you be an <strong>MB3 Supporter <em>and</em> also register the plug-in with its creator.</strong>
diff --git a/dashboard-ui/plugins.html b/dashboard-ui/plugins.html
index cff539eaf2..9e2febf241 100644
--- a/dashboard-ui/plugins.html
+++ b/dashboard-ui/plugins.html
@@ -10,7 +10,7 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="plugins.html" data-role="button" class="ui-btn-active">Installed Plugins</a>
-                    <a href="plugincatalog.html" data-role="button">Plugin Catalog</a>
+                    <a href="plugincatalog.html" data-role="button">Catalog</a>
                     <a href="pluginupdates.html" data-role="button">Updates</a>
                 </div>
 
diff --git a/dashboard-ui/pluginupdates.html b/dashboard-ui/pluginupdates.html
index 9ee49b3e49..f1c5e3f355 100644
--- a/dashboard-ui/pluginupdates.html
+++ b/dashboard-ui/pluginupdates.html
@@ -10,7 +10,7 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="plugins.html" data-role="button">Installed Plugins</a>
-                    <a href="plugincatalog.html" data-role="button">Plugin Catalog</a>
+                    <a href="plugincatalog.html" data-role="button">Catalog</a>
                     <a href="pluginupdates.html" data-role="button" class="ui-btn-active">Updates</a>
                 </div>
 
diff --git a/dashboard-ui/scheduledtasks.html b/dashboard-ui/scheduledtasks.html
index 970ddb6525..f4c3896fa9 100644
--- a/dashboard-ui/scheduledtasks.html
+++ b/dashboard-ui/scheduledtasks.html
@@ -8,7 +8,7 @@
         <div data-role="content">
             <div class="content-primary">
                 <div class="readOnlyContent">
-                    <p>Below are Media Browser's scheduled tasks. Click into a task to adjust it's schedule.</p>
+                    <p>Click a task to adjust it's schedule.</p>
                     <div id="divScheduledTasks"></div>
                 </div>
             </div>
diff --git a/dashboard-ui/scripts/clientsettings.js b/dashboard-ui/scripts/appsplayback.js
similarity index 66%
rename from dashboard-ui/scripts/clientsettings.js
rename to dashboard-ui/scripts/appsplayback.js
index c44b0661de..a8c39e2050 100644
--- a/dashboard-ui/scripts/clientsettings.js
+++ b/dashboard-ui/scripts/appsplayback.js
@@ -1,6 +1,6 @@
 ﻿(function ($, document, window) {
 
-    $(document).on('pageshow', "#clientSettingsPage", function () {
+    $(document).on('pageshow', "#appsPlaybackPage", function () {
 
         Dashboard.showLoadingMsg();
 
@@ -8,11 +8,9 @@
 
         ApiClient.getServerConfiguration().done(function (config) {
 
-            $('#txtWeatherLocation', page).val(config.WeatherLocation);
             $('#txtMinResumePct', page).val(config.MinResumePct);
             $('#txtMaxResumePct', page).val(config.MaxResumePct);
             $('#txtMinResumeDuration', page).val(config.MinResumeDurationSeconds);
-            $('#selectWeatherUnit', page).val(config.WeatherUnit).selectmenu("refresh");
 
             $('input:first', page).focus();
 
@@ -20,19 +18,15 @@
         });
     });
 
-    function clientSettingsPage() {
+    window.AppsPlaybackPage = {
 
-        var self = this;
-
-        self.onSubmit = function () {
+        onSubmit: function () {
             var form = this;
 
             Dashboard.showLoadingMsg();
 
             ApiClient.getServerConfiguration().done(function (config) {
 
-                config.WeatherLocation = $('#txtWeatherLocation', form).val();
-                config.WeatherUnit = $('#selectWeatherUnit', form).val();
                 config.MinResumePct = $('#txtMinResumePct', form).val();
                 config.MaxResumePct = $('#txtMaxResumePct', form).val();
                 config.MinResumeDurationSeconds = $('#txtMinResumeDuration', form).val();
@@ -42,9 +36,8 @@
 
             // Disable default form submission
             return false;
-        };
-    }
+        }
 
-    window.ClientSettingsPage = new clientSettingsPage();
+    };
 
 })($, document, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/appsweather.js b/dashboard-ui/scripts/appsweather.js
new file mode 100644
index 0000000000..eab2eb2bd2
--- /dev/null
+++ b/dashboard-ui/scripts/appsweather.js
@@ -0,0 +1,41 @@
+﻿(function ($, document, window) {
+
+    $(document).on('pageshow', "#appsWeatherPage", function () {
+
+        Dashboard.showLoadingMsg();
+
+        var page = this;
+
+        ApiClient.getServerConfiguration().done(function (config) {
+
+            $('#txtWeatherLocation', page).val(config.WeatherLocation);
+            $('#selectWeatherUnit', page).val(config.WeatherUnit).selectmenu("refresh");
+
+            $('input:first', page).focus();
+
+            Dashboard.hideLoadingMsg();
+        });
+    });
+
+    window.AppsWeatherPage = {
+
+        onSubmit: function () {
+            var form = this;
+
+            Dashboard.showLoadingMsg();
+
+            ApiClient.getServerConfiguration().done(function (config) {
+
+                config.WeatherLocation = $('#txtWeatherLocation', form).val();
+                config.WeatherUnit = $('#selectWeatherUnit', form).val();
+
+                ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
+            });
+
+            // Disable default form submission
+            return false;
+        }
+
+    };
+
+})($, document, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 38ebad58dd..fd0d228e0f 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -293,7 +293,7 @@
                 var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
                 html += '<span style="color:#267F00;margin-right:5px;font-weight:bold;"> - ' + progress + '%</span>';
 
-                html += '<button type="button" data-icon="stop" data-iconpos="notext" data-inline="true" data-theme="b" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">Stop</button>';
+                html += '<button type="button" data-icon="stop" data-iconpos="notext" data-inline="true" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">Stop</button>';
             }
             else if (task.State == "Cancelling") {
                 html += '<span style="color:#cc0000;"> - Stopping</span>';
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index 3384677d62..be3f1d38e1 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -4,7 +4,7 @@
 
         var html = "";
 
-        html += "<option value=''>None</option>";
+        html += "<option value=''></option>";
 
         var ratings = [];
         var i, length, rating;
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 7c2a8d1aac..7bf578de2f 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -2,24 +2,56 @@
 
     onPageShow: function () {
 
+        var page = this;
         MediaLibraryPage.lastVirtualFolderName = "";
 
-        MediaLibraryPage.reloadLibrary(this);
+        MediaLibraryPage.reloadUsers(page);
+
+        $('#selectUser', page).on('change.reloadLibrary', function() {
+
+            MediaLibraryPage.reloadLibrary(page);
+
+        });
+    },
+    
+    onPageHide: function() {
+
+        $('#selectUser', page).off('click.reloadLibrary');
+    },
+
+    reloadUsers: function (page) {
+
+        ApiClient.getUsers().done(function (users) {
+
+
+            var html = users.map(function (u) {
+
+                return '<option value="' + u.Id + '">' + u.Name + '</option>';
+
+            });
+
+            html = '<option value="">Default Library</option>' + html;
+
+            $('#selectUser', page).html(html).val('').selectmenu('refresh');
+
+            MediaLibraryPage.reloadLibrary(page);
+        });
+    },
+    
+    getCurrentUserId: function(page) {
+
+        return $('#selectUser', page).val();
     },
 
     reloadLibrary: function (page) {
 
         Dashboard.showLoadingMsg();
 
-        var userId = getParameterByName("userId");
+        var userId = MediaLibraryPage.getCurrentUserId(page);
 
         if (userId) {
 
-            $('#userProfileNavigation', page).show();
-            $('#defaultNavigation', page).hide();
-
             ApiClient.getUser(userId).done(function (user) {
-                Dashboard.setPageTitle(user.Name);
 
                 $('#fldUseDefaultLibrary', page).show();
 
@@ -42,9 +74,6 @@
 
         } else {
 
-            $('#userProfileNavigation', page).hide();
-            $('#defaultNavigation', page).show();
-
             ApiClient.getVirtualFolders().done(function (result) {
                 MediaLibraryPage.reloadVirtualFolders(page, result);
             });
@@ -138,8 +167,8 @@
 
         Dashboard.showLoadingMsg();
 
-        var userId = getParameterByName("userId");
         var page = $.mobile.activePage;
+        var userId = MediaLibraryPage.getCurrentUserId(page);
 
         ApiClient.getUser(userId).done(function (user) {
 
@@ -159,7 +188,7 @@
 
         MediaLibraryPage.getTextValue("Add Media Collection", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
 
-            var userId = getParameterByName("userId");
+            var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
             MediaLibraryPage.lastVirtualFolderName = name;
 
@@ -180,7 +209,7 @@
 
                 MediaLibraryPage.lastVirtualFolderName = virtualFolder.Name;
 
-                var userId = getParameterByName("userId");
+                var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
                 var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
 
@@ -297,7 +326,7 @@
 
             if (virtualFolder.Name != newName) {
 
-                var userId = getParameterByName("userId");
+                var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
                 var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
 
@@ -330,7 +359,7 @@
 
             if (confirmResult) {
 
-                var userId = getParameterByName("userId");
+                var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
                 var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
 
@@ -355,7 +384,7 @@
 
             if (confirmResult) {
 
-                var userId = getParameterByName("userId");
+                var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
                 var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
 
@@ -380,4 +409,4 @@
     }
 };
 
-$(document).on('pageshow', ".mediaLibraryPage", MediaLibraryPage.onPageShow);
\ No newline at end of file
+$(document).on('pageshow', ".mediaLibraryPage", MediaLibraryPage.onPageShow).on('pagehide', ".mediaLibraryPage", MediaLibraryPage.onPageHide);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 84e145f911..5670afa985 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -487,8 +487,8 @@ var Dashboard = {
             html += '<img style="max-height:125px;max-width:200px;" src="' + imageUrl + '" />';
             html += '</p>';
 
-            html += '<p><button type="button" onclick="Dashboard.navigate(\'edituser.html?userId=' + user.Id + '\');" data-icon="user">View Profile</button></p>';
-            html += '<p><button type="button" onclick="Dashboard.logout();" data-icon="lock">Sign Out</button></p>';
+            html += '<p><a data-mini="true" data-role="button" href="edituser.html?userId=' + user.Id + '" data-icon="user">View Profile</button></a>';
+            html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">Sign Out</button></p>';
             html += '</div>';
 
             html += '</div>';
@@ -624,7 +624,7 @@ var Dashboard = {
 
             var html = '<div class="content-secondary ui-bar-a toolsSidebar">';
 
-            html += '<h1><a href="index.html" class="imageLink" style="margin-left: 0;margin-right: 20px;"> <img src="css/images/mblogoicon.png" /></a>Tools</h1>';
+            html += '<h1><a href="index.html" class="imageLink" style="margin-left: 0;margin-right: 15px;"> <img src="css/images/mblogoicon.png" style="height:28px;" /></a>Tools</h1>';
 
             html += '<div class="sidebarLinks">';
 
@@ -633,6 +633,10 @@ var Dashboard = {
             for (var i = 0, length = links.length; i < length; i++) {
 
                 var link = links[i];
+                
+                if (link.divider) {
+                    html += "<div class='sidebarDivider'></div>";
+                }
 
                 if (link.href) {
 
@@ -645,7 +649,7 @@ var Dashboard = {
                 }
             }
 
-            html += '<a href="edititemmetadata.html" style="margin-top: 1em;">Metadata Manager</a>';
+            //html += '<a href="edititemmetadata.html">Metadata Manager</a>';
 
             // collapsible
             html += '</div>';
@@ -666,7 +670,8 @@ var Dashboard = {
             href: "dashboard.html",
             selected: pageElem.id == "dashboardPage"
         }, {
-            name: "Default Media Library",
+            name: "Media Library",
+            divider: true,
             href: "library.html",
             selected: pageElem.id == "mediaLibraryPage" && !getParameterByName('userId')
         }, {
@@ -678,15 +683,17 @@ var Dashboard = {
             href: "plugins.html",
             selected: page.hasClass("pluginConfigurationPage")
         }, {
-            name: "User Profiles",
+            name: "Users",
+            divider: true,
             href: "userprofiles.html",
             selected: page.hasClass("userProfilesConfigurationPage") || (pageElem.id == "mediaLibraryPage" && getParameterByName('userId'))
         }, {
-            name: "Client Settings",
-            href: "clientsettings.html",
-            selected: pageElem.id == "clientSettingsPage"
+            name: "App Settings",
+            href: "appsplayback.html",
+            selected: page.hasClass("appsPage")
         }, {
             name: "Advanced",
+            divider: true,
             href: "advanced.html",
             selected: pageElem.id == "advancedConfigurationPage"
         }, {
@@ -695,6 +702,7 @@ var Dashboard = {
             selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage"
         }, {
             name: "Help",
+            divider: true,
             href: "support.html",
             selected: pageElem.id == "supportPage" || pageElem.id == "logPage" || pageElem.id == "supporterPage" || pageElem.id == "supporterKeyPage" || pageElem.id == "aboutPage"
         }];
diff --git a/dashboard-ui/support.html b/dashboard-ui/support.html
index 9cc0a1f2b0..f1b9c30eb9 100644
--- a/dashboard-ui/support.html
+++ b/dashboard-ui/support.html
@@ -17,17 +17,18 @@
                         <a href="about.html" data-role="button">About</a>
                     </div>
                     <p>
-                        Media Browser has a thriving community of users and a vast knowledge base of information to help you get the most
-                    out of your media collection.
+                        Media Browser has a thriving community of users and contributors.
                     </p>
                     <a data-role="button" data-icon="arrow-r" data-iconpos="right" href="http://mediabrowser3.com/community" target="_blank">Visit the Community</a>
+                    <br />
                     <p>
-                        Also, within the tracker, there is a large Knowledge Base of information compiled from users and developers to help you get the 
+                        Check out our knowledge base to help you get the 
                     most out of Media Browser.
                     </p>
                     <a data-role="button" data-icon="search" data-iconpos="right" href="http://mediabrowser3.com/community/index.php?/forum/23-knowledge-base/" target="_blank">Search the Knowledge Base</a>
+                    <br />
                     <p>
-                        Finally, you can visit the Media Browser Web site to see what's happening with MB now and keep up with the developer blog.
+                        Visit the Media Browser Web site to catch the latest news and keep up with the developer blog.
                     </p>
                     <a data-role="button" data-icon="home" data-iconpos="right" href="http://www.mediabrowser3.com" target="_blank">Visit the Media Browser Web Site</a>
                 </div>
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index cfe95c934f..9304e2bb34 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -18,10 +18,7 @@
                     </div>
                     <h3>Support the Media Browser Team</h3>
                     <p>
-                        Help ensure the continued development and support of this product.
-                    </p>
-                    <p>
-                        A portion of all donations will be contributed to other <a href="about.html">free tools</a> we depend on.
+                        Help ensure the continued development and support of this product. A portion of all donations will be contributed to other <a href="about.html">free tools</a> we depend on.
                     </p>
 
                     <p style="display: none; padding: 1em; border-radius: 5px; font-weight: normal;" class="ui-bar-a supporterOnly">
@@ -52,7 +49,6 @@
                         <a data-role="button" onclick="$(this).parents('form')[0].submit();">
                             <img src="css/images/supporter/donatepaypal.png" /></a>
                     </form>
-                    <br />
                     <p>Once complete, please return and <a href="supporterkey.html">enter your supporter key</a>, which you will receive by email.</p>
                 </div>
             </div>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index ce62ba9830..3fe78dc53e 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -16,101 +16,91 @@
                         <a href="supporterkey.html" data-role="button" class="ui-btn-active">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
-                    <h2>Supporter Key</h2>
                 </div>
                 <form id="supporterKeyForm">
-                    <div style="margin-top: 40px; margin-bottom: 40px">
+                    <div style="margin: 1em 0;">
                         <label for="txtSupporterKey">MB3 Supporter Key (paste from email)</label>
                         <input type="password" id="txtSupporterKey" name="txtSupporterKey" data-inline="true" />
                         <div class="fieldDescription">
-                            <strong>After becoming a supporter, you will be emailed a Supporter Key.  Simply copy and paste that key into this field and start
-                                enjoying everything the community has developed for Media Browser. <em>Only MB 3 Supporter Keys are valid here</em></strong>
+                            Enter your supporter key to start enjoying additional benefits the community has developed for Media Browser. <strong>MB3 keys only.</strong>
                         </div>
-                    <p style="display: none; padding: 1em; border-radius: 5px; font-weight: normal;" class="ui-bar-a notSupporter">
-                        <strong>MB3 Key Missing or Invalid</strong> - in order for any premium content to be registered, you must also be a MB3 Supporter.
-                        Please <a href="supporter.html">donate</a> and support the continued development of the core product.  Thank you.  
+
+                        <p style="display: none; padding: 1em; border-radius: 5px; font-weight: normal;" class="ui-bar-a notSupporter">
+                            <strong>MB3 Key Missing or Invalid</strong> - in order for any premium content to be registered, you must also be an MB3 Supporter.
+                            Please <a href="supporter.html">donate</a> and support the continued development of the core product.  Thank you.  
                         
-                    </p>
+                        </p>
 
                     </div>
-                    <div style="margin-top: 40px; margin-bottom: 40px">
-                        <label for="txtLegacyKey">Legacy Supporter Key (from MB 2.x)</label>
+                    <div style="margin: 2em 0;">
+                        <label for="txtLegacyKey">MB2 Supporter Key</label>
                         <input type="password" id="txtLegacyKey" name="txtLegacyKey" data-inline="true" />
                         <div class="fieldDescription">
-                            <strong>Some premium plug-ins may give credit for registrations with previous versions in MB 2.x. Enter your MB 2.x 
-                                Supporter Key here to allow that credit.
-                            </strong>
+                            Some premium plugins may give credit for registrations with previous versions in MB2.
                         </div>
 
                     </div>
                     <p>
-                        <button type="submit" id="mbLegacyKeyBtn" data-theme="b">Save</button>
+                        <button type="submit" id="mbLegacyKeyBtn" data-theme="b" data-icon="check">Save</button>
 
                     </p>
-
-                    <hr />
                 </form>
-                <h2>Lost Key</h2>
-                <form id="lostKeyForm">
-                    <div style="margin-top: 40px; margin-bottom: 40px">
-                        <label for="txtEmail">Email Address</label>
-                        <input type="email" required id="txtEmail" name="txtEmail" data-inline="true" />
-                        <div class="fieldDescription">
-                            <strong>If you have lost your key, enter the email address associated with your PayPal account here and hit "Retrieve Key".  The key
-                        will be emailed to you and you can come back here and paste it above.</strong>
-                        </div>
+                <br />
+                <div data-role="collapsible">
+                    <h3>Lost Key</h3>
+                    <div>
+                        <form id="lostKeyForm">
+                            <div style="margin: 1em 0;">
+                                <label for="txtEmail">Email Address</label>
+                                <input type="email" required id="txtEmail" name="txtEmail" data-inline="true" />
+                                <div class="fieldDescription">The email address that was used to purchase the key.</div>
+                            </div>
+                            <p>
+                                <button type="submit" id="mbRetrieveKeyBtn" data-icon="action" data-theme="b">Retrieve Key</button>
 
+                            </p>
+                        </form>
                     </div>
-                    <p>
-                        <button type="submit" id="mbRetrieveKeyBtn" data-theme="b">Retrieve Key</button>
+                </div>
 
-                    </p>
+                <div data-role="collapsible">
+                    <h3>Multiple Key Linking</h3>
+                    <div>
 
-                <hr/>
-                </form>
-                <form id="linkKeysForm">
-                <h2>Multiple Key Linking</h2>
-                <p>
-                    If your PayPal email address has changed causing you to have more than one MB3 supporter key, use this form to link the old key's
-                    registrations with your new one.
-                </p>
-                    <div style="margin-top: 40px; margin-bottom: 40px">
-                        <label for="txtEmail">Current Email Address</label>
-                        <input type="email" required id="txtNewEmail" name="txtNewEmail" data-inline="true" />
-                        <div class="fieldDescription">
-                            <strong>The current email address to which your new key was sent.</strong>
-                        </div>
+                        <form id="linkKeysForm">
+                            <p>
+                                If you have more than one supporter key, use this form to link the old key's registrations with your new one.
+                            </p>
+                            <div style="margin: 1em 0;">
+                                <label for="txtEmail">Current Email Address</label>
+                                <input type="email" required id="txtNewEmail" name="txtNewEmail" data-inline="true" />
+                                <div class="fieldDescription">
+                                    The current email address to which your new key was sent.
+                                </div>
+                            </div>
+                            <p>
+                                <label for="txtNewKey">New Supporter Key</label>
+                                <input type="password" required="required" id="txtNewKey" name="txtNewKey" data-inline="true" />
+                            </p>
+                            <p>
+
+                                <label for="txtOldKey">Old Supporter Key</label>
+                                <input type="password" required="required" id="txtOldKey" name="txtOldKey" data-inline="true" />
+                            </p>
+                            <p>
+                                <button type="submit" id="mbLinkKeysBtn" data-icon="check" data-theme="b">Link Keys</button>
+                            </p>
+                        </form>
                     </div>
-                    <div style="margin-top: 40px; margin-bottom: 40px">
-
-                        <label for="txtNewKey">New Supporter Key</label>
-                        <input type="password" required="" id="txtNewKey" name="txtNewKey" data-inline="true" />
-                        <div class="fieldDescription">
-                            <strong>The supporter key that was sent to the above email address.</strong>
-                        </div>
-                    </div>
-                    <div style="margin-top: 40px; margin-bottom: 40px">
-
-                        <label for="txtOldKey">Old Supporter Key</label>
-                        <input type="password" required id="txtOldKey" name="txtOldKey" data-inline="true" />
-                        <div class="fieldDescription">
-                            <strong>The supporter key attached to your previous email address.</strong>
-                        </div>
-                    </div>
-
-                    <p>
-                        <button type="submit" id="mbLinkKeysBtn" data-theme="b">Link Keys</button>
-
-                    </p>
-
-                </form>
+                </div>
             </div>
         </div>
-        <script type="text/javascript">
-            $('#supporterKeyForm').on('submit', SupporterKeyPage.updateSupporterKey);
-            $('#lostKeyForm').on('submit', SupporterKeyPage.retrieveSupporterKey);
-            $('#linkKeysForm').on('submit', SupporterKeyPage.linkSupporterKeys);
-        </script>
+    </div>
+    <script type="text/javascript">
+        $('#supporterKeyForm').on('submit', SupporterKeyPage.updateSupporterKey);
+        $('#lostKeyForm').on('submit', SupporterKeyPage.retrieveSupporterKey);
+        $('#linkKeysForm').on('submit', SupporterKeyPage.linkSupporterKeys);
+    </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/updatepassword.html b/dashboard-ui/updatepassword.html
index d93d7eb6ac..11e18d10c8 100644
--- a/dashboard-ui/updatepassword.html
+++ b/dashboard-ui/updatepassword.html
@@ -13,7 +13,6 @@
                     <a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
                     <a href="#" data-role="button" class="ui-btn-active">Password</a>
-                    <a href="#" data-role="button" class="lnkMediaLibrary" style="display: none;" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
                 </div>
                 <h2 class="formheader" style="display: none;">Create Password</h2>
                 <form id="updatePasswordForm">
diff --git a/dashboard-ui/userimage.html b/dashboard-ui/userimage.html
index 4478c55b30..4b502d1ae8 100644
--- a/dashboard-ui/userimage.html
+++ b/dashboard-ui/userimage.html
@@ -13,7 +13,6 @@
                     <a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
                     <a href="#" data-role="button" class="ui-btn-active">Image</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
                 </div>
                 <div class="readOnlyContent">
                     <p id="fldImage"></p>
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 7a90a7275d..0dbdd3064d 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -1,7 +1,7 @@
 ﻿<!DOCTYPE html>
 <html>
 <head>
-    <title>User Profiles</title>
+    <title>Users</title>
 </head>
 <body>
     <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesConfigurationPage">
@@ -9,8 +9,8 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="userprofiles.html" data-role="button" class="ui-btn-active">Users</a>
-                    <a href="allusersettings.html" data-role="button">Settings</a>
+                    <a href="userprofiles.html" data-role="button" class="ui-btn-active">Profiles</a>
+                    <a href="allusersettings.html" data-role="button">Security</a>
                 </div>
 
 
diff --git a/dashboard-ui/usersettings.html b/dashboard-ui/usersettings.html
index b34d0abd1d..d40c6f2ac6 100644
--- a/dashboard-ui/usersettings.html
+++ b/dashboard-ui/usersettings.html
@@ -13,7 +13,6 @@
                     <a href="#" data-role="button" class="ui-btn-active">Settings</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
                 </div>
                 <form id="userSettingsForm">
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index f3bf017ffb..1253f1eeaf 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -17,7 +17,6 @@
                     <label for="chkUseDefaultLibrary">Use default media library</label>
                 </p>
                 <div id="divMediaLibrary">
-                    <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless individual libraries are created.</p>
                     <p>
                         <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
                     </p>
