diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index b57cd35017..6d3a96047a 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1302,3 +1302,19 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 .tapHoldMenu li a, .playFlyout li a {
     font-size: 14px;
 }
+
+.userProfileSettingsForm {
+    max-width: 700px;
+}
+
+    .userProfileSettingsForm .detailSectionContent {
+        padding: 0 1em;
+    }
+
+@media all and (max-width: 700px) {
+
+    .userProfileSettingsForm .detailSection {
+        margin-left: 1em;
+        margin-right: 1em;
+    }
+}
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 05571c9a4a..e9b8282c42 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -14,87 +14,102 @@
         </div>
 
         <br />
-        <form class="displayPreferencesForm" style="margin: 0 auto;">
+        <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderMyViews}
-            </div>
-            <div style="margin: 0 1em;">
-                <p>${LabelSelectFolderGroups}</p>
-                <div class="folderGroupList"></div>
-                <div class="fieldDescription">${LabelSelectFolderGroupsHelp}</div>
-            </div>
-            <br />
-
-            <br />
-            <div style="margin: 0 1em;" data-role="controlgroup">
-                <label for="chkDisplayCollectionView">${LabelDisplayCollectionsView}</label>
-                <input id="chkDisplayCollectionView" type="checkbox" />
-                <label for="chkDisplayFolderView">${LabelDisplayFoldersView}</label>
-                <input id="chkDisplayFolderView" type="checkbox" />
-            </div>
-
-            <br />
-            <br />
-            <div data-role="collapsible" style="margin: 0 1em;">
-                <h2>${HeaderChannels}</h2>
-                <div>
-                    <p>${LabelGroupChannelsIntoViews}</p>
-                    <div class="channelGroupList"></div>
-                    <div class="fieldDescription">${LabelGroupChannelsIntoViewsHelp}</div>
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderMyViews}
                 </div>
-            </div>
-            <br /><br />
+                <div class="detailSectionContent">
+                    <div>
+                        <p>${LabelSelectFolderGroups}</p>
+                        <div class="folderGroupList"></div>
+                        <div class="fieldDescription">${LabelSelectFolderGroupsHelp}</div>
+                    </div>
+                    <br />
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderViewOrder}
-            </div>
-            <div style="margin: 0 1em;">
-                <p>${LabelSelectUserViewOrder}</p>
-                <div class="viewOrderList">
+                    <div data-role="controlgroup">
+                        <label for="chkDisplayCollectionView">${LabelDisplayCollectionsView}</label>
+                        <input id="chkDisplayCollectionView" type="checkbox" />
+                        <label for="chkDisplayFolderView">${LabelDisplayFoldersView}</label>
+                        <input id="chkDisplayFolderView" type="checkbox" />
+                    </div>
 
+                    <br />
+                    <div data-role="collapsible">
+                        <h2>${HeaderChannels}</h2>
+                        <div>
+                            <p>${LabelGroupChannelsIntoViews}</p>
+                            <div class="channelGroupList"></div>
+                            <div class="fieldDescription">${LabelGroupChannelsIntoViewsHelp}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
 
-            <br />
-            <br />
-
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderLatestItems}
-            </div>
-            <div style="margin: 0 1em;">
-                <p>${LabelSelectLastestItemsFolders}</p>
-                <div class="latestItemsList">
-
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderViewOrder}
                 </div>
+                <div class="detailSectionContent">
+                    <p>${LabelSelectUserViewOrder}</p>
+                    <div class="viewOrderList">
+
+                    </div>
+                </div>
+
             </div>
 
-            <br />
-            <br />
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderLatestItems}
+                </div>
+                <div class="detailSectionContent">
+                    <p>${LabelSelectLastestItemsFolders}</p>
+                    <div class="latestItemsList">
+
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderOtherDisplaySettings}
+                </div>
+                <div class="detailSectionContent">
+                    <br />
+                    <div data-role="controlgroup">
+                        <div>
+                            <input type="checkbox" id="chkDisplayMissingEpisodes" />
+                            <label for="chkDisplayMissingEpisodes">${LabelDisplayMissingEpisodesWithinSeasons}</label>
+                        </div>
+                        <div>
+                            <input type="checkbox" id="chkDisplayUnairedEpisodes" />
+                            <label for="chkDisplayUnairedEpisodes">${LabelUnairedMissingEpisodesWithinSeasons}</label>
+                        </div>
+                    </div>
+                    <br />
+                    <div>
+                        <div data-role="controlgroup">
+                            <input type="checkbox" id="chkDisplayTrailersWithinMovieSuggestions" />
+                            <label for="chkDisplayTrailersWithinMovieSuggestions">${LabelDisplayTrailersWithinMovieSuggestions}</label>
+                        </div>
+                        <div class="fieldDescription">${LabelDisplayTrailersWithinMovieSuggestionsHelp}</div>
+                    </div>
+                    <br />
+                    <div>
+                        <div data-role="controlgroup">
+                            <input type="checkbox" id="chkGroupMoviesIntoCollections" />
+                            <label for="chkGroupMoviesIntoCollections">${LabelGroupMoviesIntoCollections}</label>
+                        </div>
+                        <div class="fieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
+                    </div>
+                </div>
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderOtherDisplaySettings}
             </div>
 
             <ul data-role="listview" class="ulForm">
-                <li>
-                    <input type="checkbox" id="chkDisplayMissingEpisodes" data-mini="true" />
-                    <label for="chkDisplayMissingEpisodes">${LabelDisplayMissingEpisodesWithinSeasons}</label>
-                </li>
-                <li>
-                    <input type="checkbox" id="chkDisplayUnairedEpisodes" data-mini="true" />
-                    <label for="chkDisplayUnairedEpisodes">${LabelUnairedMissingEpisodesWithinSeasons}</label>
-                </li>
-                <li>
-                    <input type="checkbox" id="chkDisplayTrailersWithinMovieSuggestions" data-mini="true" />
-                    <label for="chkDisplayTrailersWithinMovieSuggestions">${LabelDisplayTrailersWithinMovieSuggestions}</label>
-                    <div class="fieldDescription">${LabelDisplayTrailersWithinMovieSuggestionsHelp}</div>
-                </li>
-                <li>
-                    <input type="checkbox" id="chkGroupMoviesIntoCollections" data-mini="true" />
-                    <label for="chkGroupMoviesIntoCollections">${LabelGroupMoviesIntoCollections}</label>
-                    <div class="fieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
-                </li>
                 <li>
                     <button type="submit" data-theme="a" data-icon="check" data-mini="true">
                         ${ButtonOk}
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 5c18a11f77..74625a6f95 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -14,53 +14,62 @@
         </div>
 
         <br />
-        <form style="margin: 0 auto;" class="languagePreferencesForm">
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderLanguagePreferences}
-            </div>
+        <form style="margin: 0 auto;" class="languagePreferencesForm userProfileSettingsForm">
 
-            <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
-                    <select id="selectAudioLanguage" data-mini="true"></select>
-                </li>
-                <li>
-                    <input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
-                    <label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
-                </li>
-                <li>
-                    <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
-                    <select id="selectSubtitleLanguage" data-mini="true"></select>
-                </li>
-                <li>
-                    <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
-                    <select id="selectSubtitlePlaybackMode" data-mini="true">
-                        <option value="Default">${OptionDefaultSubtitles}</option>
-                        <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
-                        <option value="Always">${OptionAlwaysPlaySubtitles}</option>
-                        <option value="None">${OptionNoSubtitles}</option>
-                    </select>
-                    <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
-                </li>
-            </ul>
-            <div class="cinemaModeOptions" style="display:none;">
-                <br />
-                <div class="detailSectionHeader" style="margin: 0 .5em;">
+
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderLanguagePreferences}
+                </div>
+                <div class="detailSectionContent">
+                    <br />
+                    <div>
+                        <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
+                        <select id="selectAudioLanguage" data-mini="true"></select>
+                    </div>
+                    <br />
+                    <div data-role="controlgroup">
+                        <input type="checkbox" id="chkPlayDefaultAudioTrack" />
+                        <label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
+                        <select id="selectSubtitleLanguage" data-mini="true"></select>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
+                        <select id="selectSubtitlePlaybackMode" data-mini="true">
+                            <option value="Default">${OptionDefaultSubtitles}</option>
+                            <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
+                            <option value="Always">${OptionAlwaysPlaySubtitles}</option>
+                            <option value="None">${OptionNoSubtitles}</option>
+                        </select>
+                        <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
+                        <div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
+                        <div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
+                        <div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
+                    </div>
+                </div>
+
+            </div>
+            <div class="detailSection cinemaModeOptions" style="display:none;">
+                <div class="detailSectionHeader">
                     ${HeaderCinemaMode}
                 </div>
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
+                <div class="detailSectionContent">
+                    <br />
+                    <div data-role="controlgroup">
+                        <input type="checkbox" id="chkEnableCinemaMode" />
                         <label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
+                    </div>
+
+                    <div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
+                </div>
 
-                        <div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
-                    </li>
-                </ul>
             </div>
+
             <ul data-role="listview" class="ulForm">
                 <li>
                     <button type="submit" data-theme="a" data-icon="check" data-mini="true">
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index eb48012926..e2ae1b04c7 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -14,135 +14,143 @@
         </div>
 
         <br />
-        <form class="webClientPreferencesForm" style="margin: 0 auto;">
+        <form class="webClientPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderHomePage}
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderHomePage}
+                </div>
+
+                <div class="detailSectionContent">
+                    <br />
+                    <div>
+                        <label for="selectHomeSection1">${LabelHomePageSection1}</label>
+                        <select id="selectHomeSection1" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="latestmedia">${OptionLatestMedia}</option>
+                            <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                            <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                            <option value="librarytiles">${OptionMyViews}</option>
+                            <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                            <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                            <option value="folders">${OptionLibraryFolders}</option>
+                            <option value="resume">${OptionResumablemedia}</option>
+                        </select>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectHomeSection2">${LabelHomePageSection2}</label>
+                        <select id="selectHomeSection2" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="latestmedia">${OptionLatestMedia}</option>
+                            <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                            <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                            <option value="librarytiles">${OptionMyViews}</option>
+                            <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                            <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                            <option value="folders">${OptionLibraryFolders}</option>
+                            <option value="resume">${OptionResumablemedia}</option>
+                            <option value="none">${OptionNone}</option>
+                        </select>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectHomeSection3">${LabelHomePageSection3}</label>
+                        <select id="selectHomeSection3" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="latestmedia">${OptionLatestMedia}</option>
+                            <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                            <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                            <option value="librarytiles">${OptionMyViews}</option>
+                            <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                            <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                            <option value="folders">${OptionLibraryFolders}</option>
+                            <option value="resume">${OptionResumablemedia}</option>
+                            <option value="none">${OptionNone}</option>
+                        </select>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectHomeSection4">${LabelHomePageSection4}</label>
+                        <select id="selectHomeSection4" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="latestmedia">${OptionLatestMedia}</option>
+                            <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                            <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                            <option value="librarytiles">${OptionMyViews}</option>
+                            <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                            <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                            <option value="folders">${OptionLibraryFolders}</option>
+                            <option value="resume">${OptionResumablemedia}</option>
+                            <option value="none">${OptionNone}</option>
+                        </select>
+                    </div>
+                </div>
             </div>
 
-            <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectHomeSection1">${LabelHomePageSection1}</label>
-                    <select id="selectHomeSection1" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection2">${LabelHomePageSection2}</label>
-                    <select id="selectHomeSection2" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection3">${LabelHomePageSection3}</label>
-                    <select id="selectHomeSection3" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection4">${LabelHomePageSection4}</label>
-                    <select id="selectHomeSection4" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-            </ul>
+            <div class="detailSection">
+                <div class="detailSectionHeader">
+                    ${HeaderSettingsForThisDevice}
+                </div>
+                <div class="detailSectionContent">
+                    <br />
+                    <div>
+                        <label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label>
+                        <select id="selectMaxBitrate" data-mini="true">
+                            <option value="30000000">30Mbps</option>
+                            <option value="25000000">25Mbps</option>
+                            <option value="20000000">20Mbps</option>
+                            <option value="15000000">15Mbps</option>
+                            <option value="10000000">10Mbps</option>
+                            <option value="8000000">8Mbps</option>
+                            <option value="6000000">6Mbps</option>
+                            <option value="5000000">5Mbps</option>
+                            <option value="4000000">4Mbps</option>
+                            <option value="3000000">3Mbps</option>
+                            <option value="2500000">2.5Mbps</option>
+                            <option value="2000000">2Mbps</option>
+                            <option value="1500000">1.5Mbps</option>
+                            <option value="1000000">1Mbps</option>
+                            <option value="720000">720kbps</option>
+                            <option value="420000">420kbps</option>
+                            <option value="400000">400kbps</option>
+                            <option value="320000">320kbps</option>
+                        </select>
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
+                        <select id="selectThemeSong" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="1">${OptionYes}</option>
+                            <option value="0">${OptionNo}</option>
+                        </select>
+                        <div class="fieldDescription">${LabelEnableThemeSongsHelp}</div>
+                    </div>
+                    <br />
+                    <div class="fldEnableBackdrops" style="display:none;">
+                        <label for="selectBackdrop">${LabelEnableBackdrops}</label>
+                        <select id="selectBackdrop" data-mini="true">
+                            <option value="">${OptionAuto}</option>
+                            <option value="1">${OptionYes}</option>
+                            <option value="0">${OptionNo}</option>
+                        </select>
+                        <div class="fieldDescription">${LabelEnableBackdropsHelp}</div>
+                    </div>
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
-                ${HeaderSettingsForThisDevice}
+                    <br />
+                    <div>
+                        <fieldset data-role="controlgroup">
+                            <legend>${LabelExternalPlayers}</legend>
+                            <!--<input type="checkbox" id="chkGoodplayer" class="chkExternalPlayer" data-name="GoodPlayer" data-scheme="goodplayer://{0}" />
+                            <label for="chkGoodplayer">GoodPlayer</label>-->
+                            <input type="checkbox" id="chkVlc" class="chkExternalPlayer" data-name="Vlc" data-scheme="vlc://{0}" />
+                            <label for="chkVlc">Vlc</label>
+                        </fieldset>
+                        <div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div>
+                    </div>
+                </div>
             </div>
-            <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label>
-                    <select id="selectMaxBitrate" data-mini="true">
-                        <option value="30000000">30Mbps</option>
-                        <option value="25000000">25Mbps</option>
-                        <option value="20000000">20Mbps</option>
-                        <option value="15000000">15Mbps</option>
-                        <option value="10000000">10Mbps</option>
-                        <option value="8000000">8Mbps</option>
-                        <option value="6000000">6Mbps</option>
-                        <option value="5000000">5Mbps</option>
-                        <option value="4000000">4Mbps</option>
-                        <option value="3000000">3Mbps</option>
-                        <option value="2500000">2.5Mbps</option>
-                        <option value="2000000">2Mbps</option>
-                        <option value="1500000">1.5Mbps</option>
-                        <option value="1000000">1Mbps</option>
-                        <option value="720000">720kbps</option>
-                        <option value="420000">420kbps</option>
-                        <option value="400000">400kbps</option>
-                        <option value="320000">320kbps</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
-                    <select id="selectThemeSong" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="1">${OptionYes}</option>
-                        <option value="0">${OptionNo}</option>
-                    </select>
-                    <div class="fieldDescription">${LabelEnableThemeSongsHelp}</div>
-                </li>
-                <li class="fldEnableBackdrops" style="display:none;">
-                    <label for="selectBackdrop">${LabelEnableBackdrops}</label>
-                    <select id="selectBackdrop" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="1">${OptionYes}</option>
-                        <option value="0">${OptionNo}</option>
-                    </select>
-                    <div class="fieldDescription">${LabelEnableBackdropsHelp}</div>
-                </li>
-            </ul>
-
-            <div style="margin: 0 1em;">
-                <fieldset data-role="controlgroup">
-                    <legend>${LabelExternalPlayers}</legend>
-                    <!--<input type="checkbox" id="chkGoodplayer" class="chkExternalPlayer" data-name="GoodPlayer" data-scheme="goodplayer://{0}" />
-                    <label for="chkGoodplayer">GoodPlayer</label>-->
-                    <input type="checkbox" id="chkVlc" class="chkExternalPlayer" data-name="Vlc" data-scheme="vlc://{0}" />
-                    <label for="chkVlc">Vlc</label>
-                </fieldset>
-                <div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div>
-            </div>
-
-            <br />
 
             <ul data-role="listview" class="ulForm">
                 <li>
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 579012a49d..5fd21367a7 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -30,7 +30,7 @@
             <div style="margin-top: .75em;"><a href="http://mediabrowser.tv/connect" target="_blank">${ButtonLearnMoreAboutMediaBrowserConnect}</a></div>
         </div>
 
-        <form class="newImageForm" style="display:none;margin: 1em auto 0;">
+        <form class="newImageForm userProfileSettingsForm" style="display:none;margin: 1em auto 0;">
 
             <div data-role="collapsible">
                 <h2 id="headerUploadNewImage" style="display: none;">${HeaderUploadNewImage}</h2>
@@ -55,7 +55,7 @@
 
         <br />
 
-        <form class="updatePasswordForm passwordSection" style="display:none;margin: 0 auto 2em;">
+        <form class="updatePasswordForm passwordSection userProfileSettingsForm" style="display:none;margin: 0 auto 2em;">
 
             <div data-role="collapsible" data-collapsed="false">
                 <h2>${HeaderPassword}</h2>
@@ -88,7 +88,7 @@
                 </div>
             </div>
         </form>
-        <form class="localAccessForm localAccessSection" style="margin: 0 auto;">
+        <form class="localAccessForm localAccessSection userProfileSettingsForm" style="margin: 0 auto;">
             <div data-role="collapsible">
                 <h2>${HeaderLocalAccess}</h2>
                 <div>