diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index d8d26a9bc4..6c3eb2dc4d 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -79,7 +79,7 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
                       {
                           if (i is Movie)
                           {
-                              return true;
+                              return !IsDuplicate(item, i);
                           }
                       }
                       return false;
@@ -162,7 +162,7 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
                 {
                     return false;
                 }
-                return true;
+                return !IsDuplicate(item, i.Item);
             })
                 .OrderByDescending(i => i.Score)
                 .ThenBy(i => Guid.NewGuid())
@@ -172,6 +172,23 @@ public async Task<IEnumerable<IntroInfo>> GetIntros(BaseItem item, User user)
                 .Concat(customIntros.Take(1));
         }
 
+        private bool IsDuplicate(BaseItem playingContent, BaseItem test)
+        {
+            var id = playingContent.GetProviderId(MetadataProviders.Imdb);
+            if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            id = playingContent.GetProviderId(MetadataProviders.Tmdb);
+            if (!string.IsNullOrWhiteSpace(id) && string.Equals(id, test.GetProviderId(MetadataProviders.Tmdb), StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         private CinemaModeConfiguration GetOptions()
         {
             return _serverConfig.GetConfiguration<CinemaModeConfiguration>("cinemamode");
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index ceda8f47d9..58a6f649cd 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1417,6 +1417,10 @@ private async Task SaveCapabilities(string deviceId, SessionCapabilities capabil
             {
                 _jsonSerializer.SerializeToFile(capabilities, path);
             }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error saving to {0}", ex, path);
+            }
             finally
             {
                 _capabilitiesLock.Release();
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceslanguages.html b/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceslanguages.html
index 53aaa669fc..7273ca94f3 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceslanguages.html
+++ b/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceslanguages.html
@@ -14,64 +14,66 @@
 
         <br />
         <form style="margin: 0 auto;" class="languagePreferencesForm">
-            <div class="detailSectionHeader">
+            <div class="detailSectionHeader" style="margin: 0 .5em;">
                 ${HeaderLanguagePreferences}
             </div>
 
             <br />
-            <div>
-                <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
-                <select id="selectAudioLanguage" data-mini="true"></select>
-            </div><br />
-            <div>
-                <input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
-                <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>
-
-            <br /><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">
+                <div class="detailSectionHeader" style="margin: 0 .5em;">
                     ${HeaderCinemaMode}
                 </div>
-                <br />
-                <div>
-                    <input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
-                    <label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
+                <ul data-role="listview" class="ulForm">
+                    <li>
+                        <input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
+                        <label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
 
-                    <div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
-                </div>
-                <br /><br />
-            </div>
-            <div>
-                <button type="submit" data-theme="a" data-icon="check" data-mini="true">
-                    ${ButtonOk}
-                </button>
-                <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
-                    ${ButtonCancel}
-                </button>
+                        <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">
+                        ${ButtonOk}
+                    </button>
+                    <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                        ${ButtonCancel}
+                    </button>
+                </li>
+            </ul>
         </form>
         <script type="text/javascript">
             $('.languagePreferencesForm').off('submit', LanguagePreferencesPage.onSubmit).on('submit', LanguagePreferencesPage.onSubmit);
         </script>
     </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceswebclient.html b/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceswebclient.html
index 6d7a642343..e461883ae7 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceswebclient.html
+++ b/MediaBrowser.WebDashboard/dashboard-ui/mypreferenceswebclient.html
@@ -12,122 +12,126 @@
             <a href="#" class="ui-btn-active lnkWebClientPreferences">${TabWebClient}</a>
         </div>
 
+        <br />
         <br />
         <form class="webClientPreferencesForm" style="margin: 0 auto;">
 
-            <div class="detailSectionHeader">
+            <div class="detailSectionHeader" style="margin: 0 .5em;">
                 ${HeaderHomePage}
             </div>
 
             <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><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="detailSectionHeader">
+            <div class="detailSectionHeader" style="margin: 0 .5em;">
                 ${HeaderSettingsForThisDevice}
             </div>
             <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><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>
+            <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}" />
@@ -138,20 +142,22 @@
                 <div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div>
             </div>
 
-            <br /><br />
+            <br />
 
-            <div>
-                <button type="submit" data-theme="a" data-icon="check" data-mini="true">
-                    ${ButtonOk}
-                </button>
-                <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
-                    ${ButtonCancel}
-                </button>
-            </div>
+            <ul data-role="listview" class="ulForm">
+                <li>
+                    <button type="submit" data-theme="a" data-icon="check" data-mini="true">
+                        ${ButtonOk}
+                    </button>
+                    <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                        ${ButtonCancel}
+                    </button>
+                </li>
+            </ul>
         </form>
         <script type="text/javascript">
             $('.webClientPreferencesForm').off('submit', WebClientPreferencesPage.onSubmit).on('submit', WebClientPreferencesPage.onSubmit);
         </script>
     </div>
 </body>
-</html>
+</html>
\ No newline at end of file