diff --git a/ApiClient.js b/ApiClient.js
index 74f989fc07..dbc7ca6d75 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -223,6 +223,9 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
             if (!userId) {
                 throw new Error("null userId");
             }
+            if (!itemId) {
+                throw new Error("null itemId");
+            }
 
             var url = self.getUrl("Users/" + userId + "/Items/" + itemId);
 
diff --git a/dashboard-ui/css/images/clients/amazon.png b/dashboard-ui/css/images/clients/amazon.png
index e8aa9c3f66..def73d327b 100644
Binary files a/dashboard-ui/css/images/clients/amazon.png and b/dashboard-ui/css/images/clients/amazon.png differ
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 747927a2ce..a65d8a37dc 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -537,6 +537,10 @@ a.itemTag:hover {
     padding: 0 1em;
 }
 
+.mobileDetailButtons {
+    display: none;
+}
+
 .libraryPage ::-webkit-scrollbar {
     width: 12px;
     height: 12px;
@@ -722,11 +726,11 @@ a.itemTag:hover {
         margin-top: 0;
     }
 
-    .mobileOverview, .mobileGenres {
+    .mobileOverview, .mobileGenres, .mobileDetailButtons {
         display: block;
     }
 
-    .desktopOverview, .desktopGenres {
+    .desktopOverview, .desktopGenres, .desktopDetailButtons {
         display: none;
     }
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index f6d6574d6d..474acd4297 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -327,7 +327,7 @@ h1 .imageLink {
 }
 
 .appLinks img {
-    height: 30px;
+    height: 32px;
 }
 
 .activeDevicesCollapsible .ui-collapsible-content {
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 9b14dd2b60..3b5d3e5f7b 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -27,7 +27,7 @@
                             <label for="selectLocalizationLanguage">Preferred display language</label>
                             <select id="selectLocalizationLanguage" data-mini="true">
                             </select>
-                            <div class="fieldDescription">Translating Media Browser is an ongoing project. <a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">Read about how you can contribute</a>.</div>
+                            <div class="fieldDescription">Translating Media Browser is an ongoing project and is not yet complete. <a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">Read about how you can contribute</a>.</div>
                         </li>
                     </ul>
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 8e0bcf4c9d..b12387604f 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -132,19 +132,21 @@
                         <div class="transcodingProfiles"></div>
                     </div>
                     <div class="tabContent tabContainerProfiles">
-                        <p>Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the device supports the container natively.</p>
+                        <p>Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the format is configured for direct play.</p>
                         <button class="btnAddContainerProfile" type="button" data-mini="true" data-icon="plus">New</button>
                         <br />
                         <div class="containerProfiles"></div>
                     </div>
                     <div class="tabContent tabCodecProfiles">
-                        <p>Codec profiles indicate the limitations of a device when playing specific codecs. If a limitation applies then the media will be transcoded, even if the device supports the codec natively.</p>
+                        <p>Codec profiles indicate the limitations of a device when playing specific codecs. If a limitation applies then the media will be transcoded, even if the codec is configured for direct play.</p>
                         <button class="btnAddCodecProfile" type="button" data-mini="true" data-icon="plus">New</button>
                         <br />
                         <div class="codecProfiles"></div>
                     </div>
                     <div class="tabContent tabMediaProfiles">
                         <p>Response profiles provide a way to customize information sent to the device when playing certain kinds of media.</p>
+                        <button class="btnAddResponseProfile" type="button" data-mini="true" data-icon="plus">New</button>
+                        <br />
                         <div class="mediaProfiles"></div>
                     </div>
                     <br />
@@ -300,18 +302,32 @@
 
                     <p>Define additional conditions that must be met in order for a file to be direct played.</p>
 
-                    <div style="margin: 1em 0;">
-                        <label for="selectContainerProfileType">Type:</label>
-                        <select id="selectContainerProfileType" data-mini="true">
-                            <option value="Photo">Photo</option>
-                            <option value="Video">Video</option>
-                        </select>
+<!--                    <div data-role="controlgroup" data-type="horizontal" data-mini="true">
+                        <input type="radio" name="radioContainerProfileTab" class="radioTabButton" id="radioContainerProfileInfo" value="tabContainerBasics">
+                        <label for="radioContainerProfileInfo">Info</label>
+                        <input type="radio" name="radioContainerProfileTab" class="radioTabButton" id="radioContainerProfileConditions" value="tabContainerConditions">
+                        <label for="radioContainerProfileConditions">Conditions</label>
+                    </div>-->
+
+                    <div class="tabContent tabContainerBasics">
+                        <div style="margin: 1em 0;">
+                            <label for="selectContainerProfileType">Type:</label>
+                            <select id="selectContainerProfileType" data-mini="true">
+                                <option value="Photo">Photo</option>
+                                <option value="Video">Video</option>
+                            </select>
+                        </div>
+
+                        <div style="margin: 1em 0;">
+                            <label for="txtContainerProfileContainer">Containers:</label>
+                            <input type="text" id="txtContainerProfileContainer" data-mini="true" />
+                            <div>Separated by comma. This can be left empty to apply to all containers</div>
+                        </div>
+
                     </div>
 
-                    <div style="margin: 1em 0;">
-                        <label for="txtContainerProfileContainer">Containers:</label>
-                        <input type="text" id="txtContainerProfileContainer" data-mini="true" />
-                        <div>Separated by comma. This can be left empty to apply to all containers</div>
+                    <div class="tabContent tabContainerConditions" style="display: none;">
+                        
                     </div>
 
                     <p>
@@ -363,6 +379,54 @@
                 </form>
             </div>
 
+        </div>
+        <div data-role="popup" data-transition="slidefade" id="responseProfilePopup" class="popup">
+
+            <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
+                <h3>Response Profile</h3>
+            </div>
+
+            <div data-role="content">
+                <form class="editResponseProfileForm">
+
+                    <div style="margin: 1em 0;">
+                        <label for="selectResponseProfileType">Type:</label>
+                        <select id="selectResponseProfileType" data-mini="true">
+                            <option value="Audio">Audio</option>
+                            <option value="Photo">Photo</option>
+                            <option value="Video">Video</option>
+                        </select>
+                    </div>
+
+                    <div style="margin: 1em 0;">
+                        <label for="txtResponseProfileContainer">Container:</label>
+                        <input type="text" id="txtResponseProfileContainer" data-mini="true" />
+                        <div>Separated by comma. This can be left empty to apply to all containers</div>
+                    </div>
+
+                    <div id="fldResponseProfileVideoCodec" style="margin: 1em 0;">
+                        <label for="txtResponseProfileVideoCodec">Video codecs:</label>
+                        <input type="text" id="txtResponseProfileVideoCodec" data-mini="true" />
+                        <div>Separated by comma. This can be left empty to apply to all containers</div>
+                    </div>
+
+                    <div id="fldResponseProfileAudioCodec" style="margin: 1em 0 2em;">
+                        <label for="txtResponseProfileAudioCodec">Audio codecs:</label>
+                        <input type="text" id="txtResponseProfileAudioCodec" data-mini="true" />
+                        <div>Separated by comma. This can be left empty to apply to all containers</div>
+                    </div>
+
+                    <p>
+                        <button type="submit" data-theme="b" data-icon="check" data-mini="true">
+                            Ok
+                        </button>
+                        <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');" data-mini="true">
+                            Cancel
+                        </button>
+                    </p>
+                </form>
+            </div>
+
         </div>
         <script type="text/javascript">
             $('.dlnaProfileForm').off('submit', DlnaProfilePage.onSubmit).on('submit', DlnaProfilePage.onSubmit);
@@ -370,6 +434,7 @@
             $('.transcodingProfileForm').off('submit', DlnaProfilePage.onTranscodingProfileFormSubmit).on('submit', DlnaProfilePage.onTranscodingProfileFormSubmit);
             $('.containerProfileForm').off('submit', DlnaProfilePage.onContainerProfileFormSubmit).on('submit', DlnaProfilePage.onContainerProfileFormSubmit);
             $('.codecProfileForm').off('submit', DlnaProfilePage.onCodecProfileFormSubmit).on('submit', DlnaProfilePage.onCodecProfileFormSubmit);
+            $('.editResponseProfileForm').off('submit', DlnaProfilePage.onResponseProfileFormSubmit).on('submit', DlnaProfilePage.onResponseProfileFormSubmit);
         </script>
     </div>
 </body>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index ad52280964..0697c15ace 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -19,46 +19,46 @@
                 <form class="encodingSettingsForm">
 
                     <fieldset data-role="controlgroup">
-                        <legend>Transcoding Quality Preference:</legend>
+                        <legend>${HeaderTranscodingQualityPreference}</legend>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioAuto" value="Auto">
                         <label for="radioAuto">
-                            Auto<br />
-                            <span style="font-weight: normal;">The server will decide quality and speed</span></label>
+                            ${OptionAutomatic}<br />
+                            <span style="font-weight: normal;">${OptionAutomaticTranscodingHelp}</span></label>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighSpeed" value="HighSpeed">
                         <label for="radioHighSpeed">
-                            Higher speed<br />
-                            <span style="font-weight: normal;">Lower quality, but faster encoding</span></label>
+                            ${OptionHighSpeedTranscoding}<br />
+                            <span style="font-weight: normal;">${OptionHighSpeedTranscodingHelp}</span></label>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighQuality" value="HighQuality">
                         <label for="radioHighQuality">
-                            Higher quality<br />
-                            <span style="font-weight: normal;">Higher quality, but slower encoding</span></label>
+                            ${OptionHighQualityTranscoding}<br />
+                            <span style="font-weight: normal;">${OptionHighQualityTranscodingHelp}</span></label>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioMaxQuality" value="MaxQuality">
                         <label for="radioMaxQuality">
-                            Max quality<br />
-                            <span style="font-weight: normal;">Best quality with slower encoding and high CPU usage</span></label>
+                            ${OptionMaxQualityTranscoding}<br />
+                            <span style="font-weight: normal;">${OptionMaxQualityTranscodingHelp}</span></label>
                     </fieldset>
 
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <input type="checkbox" id="chkAllowUpscaling" name="chkAllowUpscaling" data-mini="true" />
-                            <label for="chkAllowUpscaling">Allow video upscaling when requested by clients</label>
-                            <div class="fieldDescription">In some cases this will result in improved video quality but will increase CPU usage.</div>
+                            <label for="chkAllowUpscaling">${OptionUpscaling}</label>
+                            <div class="fieldDescription">${OptionUpscalingHelp}</div>
                         </li>
                         <li>
                             <input type="checkbox" id="chkEnableDebugEncodingLogging" name="chkEnableDebugEncodingLogging" data-mini="true" />
-                            <label for="chkEnableDebugEncodingLogging">Enable debug transcoding logging</label>
-                            <div class="fieldDescription">This will create very large log files and is only recommended as needed for troubleshooting purposes.</div>
+                            <label for="chkEnableDebugEncodingLogging">${OptionEnableDebugTranscodingLogging}</label>
+                            <div class="fieldDescription">${OptionEnableDebugTranscodingLoggingHelp}</div>
                         </li>
                     </ul>
 
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <button type="submit" data-theme="b" data-icon="check" data-mini="true">
-                                Save
+                                ${ButtonSave}
                             </button>
                             <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
-                                Cancel
+                                ${ButtonCancel}
                             </button>
                         </li>
                     </ul>
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index 90af590846..135f58c40b 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -24,13 +24,13 @@
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
                     <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="${ButtonSort}" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">${ButtonSort}</button>
                     <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="${ButtonFilter}" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">${ButtonFilter}</button>
-                    <button data-mini="true" data-icon="check" data-inline="true" data-iconpos="notext" title="Select" class="btnToggleSelections">Select</button>
+                    <button data-mini="true" data-icon="check" data-inline="true" data-iconpos="notext" title="${ButtonSelect}" class="btnToggleSelections">${ButtonSelect}</button>
                 </div>
                 <div class="listTopPaging">
                 </div>
                 <div class="selectionCommands" style="display: none;">
                     <div data-role="controlgroup" data-type="horizontal" class="selectionCommandsControlGroup">
-                        <button class="btnMergeVersions" data-mini="true" data-icon="recycle" data-inline="true" title="Combine Versions">Group Versions</button>
+                        <button class="btnMergeVersions" data-mini="true" data-icon="recycle" data-inline="true" title="${ButtonGroupVersions}">${ButtonGroupVersions}</button>
                     </div>
                 </div>
             </div>
@@ -45,13 +45,13 @@
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSeriesSortName" value="on" checked="checked" data-sortby="SeriesSortName,SortName" data-mini="true">
-                    <label for="radioSeriesSortName">Series name</label>
+                    <label for="radioSeriesSortName">${OptionSeriesSortName}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
-                    <label for="radioSortName">Episode sort name</label>
+                    <label for="radioSortName">${OptionEpisodeSortName}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioCommunityRating">Tvdb rating</label>
+                    <label for="radioCommunityRating">${OptionTvdbRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated,SeriesSortName,SortName" data-mini="true">
                     <label for="radioDateCreated">${OptionDateAdded}</label>
@@ -113,13 +113,13 @@
                     <label for="chkDislikes">${OptionDislikes}</label>
 
                     <input type="checkbox" name="chkSpecialFeature" id="chkSpecialFeature" data-mini="true">
-                    <label for="chkSpecialFeature">Season 0</label>
+                    <label for="chkSpecialFeature">${OptionSpecialEpisode}</label>
 
                     <input type="checkbox" name="chkMissingEpisode" id="chkMissingEpisode" data-mini="true">
-                    <label for="chkMissingEpisode">Missing Episode</label>
+                    <label for="chkMissingEpisode">${OptionMissingEpisode}</label>
 
                     <input type="checkbox" name="chkFutureEpisode" id="chkFutureEpisode" data-mini="true">
-                    <label for="chkFutureEpisode">Unaired Episode</label>
+                    <label for="chkFutureEpisode">${OptionUnairedEpisode}</label>
 
                 </fieldset>
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html
index 2f25247ffa..89b3e3db69 100644
--- a/dashboard-ui/gamegenres.html
+++ b/dashboard-ui/gamegenres.html
@@ -8,7 +8,7 @@
         <div class="libraryViewNav">
             <a href="gamesrecommended.html">${TabSuggested}</a>
             <a href="games.html">${TabGames}</a>
-            <a href="gamesystems.html">Game Systems</a>
+            <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="gamegenres.html" class="ui-btn-active">${TabGenres}</a>
             <a href="gamestudios.html">${TabStudios}</a>
         </div>
@@ -37,13 +37,6 @@
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
                     <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
-
-                <fieldset data-role="controlgroup">
-                    <legend>
-                        <strong>Game System:</strong>
-                    </legend>
-
-                </fieldset>
             </form>
         </div>
 
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html
index 42773f37e0..a5ac63935d 100644
--- a/dashboard-ui/games.html
+++ b/dashboard-ui/games.html
@@ -8,7 +8,7 @@
         <div class="libraryViewNav">
             <a href="gamesrecommended.html">${TabSuggested}</a>
             <a href="games.html" class="ui-btn-active">${TabGames}</a>
-            <a href="gamesystems.html">Game Systems</a>
+            <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
             <a href="gamestudios.html">${TabStudios}</a>
         </div>
@@ -36,7 +36,7 @@
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
-                    <label for="radioSortName">Name</label>
+                    <label for="radioSortName">${OptionNameSort}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
                     <label for="radioCommunityRating">${OptionCommunityRating}</label>
@@ -91,20 +91,20 @@
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Players:</strong>
+                        <strong>${HeaderNumberOfPlayers}</strong>
                     </legend>
 
                     <input class="radioPlayers" type="radio" name="radioPlayers" id="radioAll" value="on" checked="checked" data-value="all" data-mini="true">
-                    <label for="radioAll">Any</label>
+                    <label for="radioAll">${OptionAnyNumberOfPlayers}</label>
 
                     <input class="radioPlayers" type="radio" name="radioPlayers" id="radioTwo" value="off" data-value="2" data-mini="true">
-                    <label for="radioTwo">2+</label>
+                    <label for="radioTwo">${Option2Player}</label>
 
                     <input class="radioPlayers" type="radio" name="radioPlayers" id="radioThree" value="off" data-value="3" data-mini="true">
-                    <label for="radioThree">3+</label>
+                    <label for="radioThree">${Option3Player}</label>
 
                     <input class="radioPlayers" type="radio" name="radioPlayers" id="radioFour" value="off" data-value="4" data-mini="true">
-                    <label for="radioFour">4+</label>
+                    <label for="radioFour">${Option4Player}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html
index fbeee4602c..e6b0cab846 100644
--- a/dashboard-ui/gamesrecommended.html
+++ b/dashboard-ui/gamesrecommended.html
@@ -16,13 +16,13 @@
             <table class="ehsContent">
                 <tr>
                     <td>
-                        <h1 class="listHeader">Latest Games</h1>
+                        <h1 class="listHeader">${HeaderLatestGames}</h1>
 
                         <div id="recentlyAddedItems">
                         </div>
 
                         <div id="recentlyPlayedSection" style="display: none;">
-                            <h1 class="listHeader">Recently Played Games</h1>
+                            <h1 class="listHeader">${HeaderRecentlyPlayedGames}</h1>
 
                             <div id="recentlyPlayedItems">
                             </div>
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html
index 4424c7c3f9..0ecb868a78 100644
--- a/dashboard-ui/gamestudios.html
+++ b/dashboard-ui/gamestudios.html
@@ -8,7 +8,7 @@
         <div class="libraryViewNav">
             <a href="gamesrecommended.html">${TabSuggested}</a>
             <a href="games.html">${TabGames}</a>
-            <a href="gamesystems.html">Game Systems</a>
+            <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
             <a href="gamestudios.html" class="ui-btn-active">${TabStudios}</a>
         </div>
@@ -37,13 +37,6 @@
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
                     <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
-
-                <fieldset data-role="controlgroup">
-                    <legend>
-                        <strong>Game Systems:</strong>
-                    </legend>
-
-                </fieldset>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html
index af86a4db5e..0f5de4c14d 100644
--- a/dashboard-ui/gamesystems.html
+++ b/dashboard-ui/gamesystems.html
@@ -8,7 +8,7 @@
         <div class="libraryViewNav">
             <a href="gamesrecommended.html">${TabSuggested}</a>
             <a href="games.html">${TabGames}</a>
-            <a href="gamesystems.html" class="ui-btn-active">Game Systems</a>
+            <a href="gamesystems.html" class="ui-btn-active">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
             <a href="gamestudios.html">${TabStudios}</a>
         </div>
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index cad3502968..5fe8a724f1 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -15,7 +15,7 @@
                         <div id="views">
                         </div>
                         <br />
-                        <h1 class="listHeader"><a href="itemlist.html">Media Folders<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
+                        <h1 class="listHeader"><a href="itemlist.html">${HeaderMediaFolders}<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
 
                         <div id="divCollections"></div>
                     </td>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index f2020586d7..77b659433f 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -146,7 +146,7 @@
                 <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
             </span>
             <span id="editButtonContainer" style="display: none;">
-                <a id="btnEdit" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">Edit</a>
+                <a id="btnEdit" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
             </span>
         </div>
         <div data-role="content">
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 12a226314e..6a3c280f00 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -85,7 +85,7 @@
             <div class="libraryViewNav">
                 <a href="gamesrecommended.html">${TabSuggested}</a>
                 <a href="games.html">${TabGames}</a>
-                <a href="gamesystems.html" class="ui-btn-active">Game Systems</a>
+                <a href="gamesystems.html" class="ui-btn-active">${TabGameSystems}</a>
                 <a href="gamegenres.html">${TabGenres}</a>
                 <a href="gamestudios.html">${TabStudios}</a>
             </div>
@@ -109,35 +109,38 @@
                             <p id="artist"></p>
                             <p class="itemGenres desktopGenres"></p>
                             <p class="itemOverview desktopOverview"></p>
-                            <div class="detailButtonsContainer" style="text-align: left;">
-                                <span id="missingIndicator" style="margin-left: .5em; display: none;">
-                                    <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">MISSING</span>
+                            <div class="detailButtonsContainer desktopDetailButtons" style="text-align: left;">
+                                <span class="missingIndicator" style="margin-left: .5em; display: none;">
+                                    <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>
                                 </span>
-                                <span id="offlineIndicator" style="margin-left: .5em; display: none;">
-                                    <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">OFFLINE</span>
-                                </span>
-                                <span id="playButtonContainer" style="display: none;">
-                                    <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
-                                </span>
-                                <span id="trailerButtonContainer" style="display: none;">
-                                    <button id="btnPlayTrailer" type="button" data-icon="video" data-inline="true" data-mini="true">Trailer</button>
-                                </span>
-                                <span id="externalTrailerButtonContainer" style="display: none;">
-                                    <a id="btnPlayExternalTrailer" data-role="button" data-icon="video" data-inline="true" data-mini="true" href="#" target="_blank">Trailer</a>
-                                </span>
-                                <span id="playExternalButtonContainer" style="display: none;">
-                                    <a id="btnPlayExternal" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
-                                </span>
-                                <span id="editButtonContainer" style="display: none;">
-                                    <a id="btnEdit" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">Edit</a>
+                                <span class="offlineIndicator" style="margin-left: .5em; display: none;">
+                                    <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span>
                                 </span>
+                                <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
+                                <button class="btnPlayTrailer hide" type="button" data-icon="video" data-inline="true" data-mini="true">${ButtonPlayTrailer}</button>
+                                <a class="btnPlayExternalTrailer hide" data-role="button" data-icon="video" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlayTrailer}</a>
+                                <a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
+                                <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
                             </div>
                         </td>
                     </tr>
                 </table>
+                <div class="detailButtonsContainer mobileDetailButtons">
+                    <span class="missingIndicator" style="margin-left: .5em; display: none;">
+                        <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>
+                    </span>
+                    <span class="offlineIndicator" style="margin-left: .5em; display: none;">
+                        <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span>
+                    </span>
+                    <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
+                    <button class="btnPlayTrailer hide" type="button" data-icon="video" data-inline="true" data-mini="true">${ButtonPlayTrailer}</button>
+                    <a class="btnPlayExternalTrailer hide" data-role="button" data-icon="video" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlayTrailer}</a>
+                    <a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
+                    <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
+                </div>
             </div>
-            <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="Previous" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">Previous</a>
-            <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="Next" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">Next</a>
+            <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="${ButtonPrevious}" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonPrevious}</a>
+            <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="${ButtonNext}" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonNext}</a>
             <p class="itemGenres mobileGenres"></p>
             <p class="itemOverview mobileOverview"></p>
         </div>
@@ -162,7 +165,7 @@
                         <div class="detailTab tabMediaInfo">
 
                             <div class="splitVersionContainer" style="border-bottom: 1px solid #444;">
-                                <button type="button" class="btnSplitVersions" data-mini="true" data-inline="true" data-icon="delete" title="Split Versions Apart">Split Versions Apart</button>
+                                <button type="button" class="btnSplitVersions" data-mini="true" data-inline="true" data-icon="delete" title="${ButtonSplitVersionsApart}">${ButtonSplitVersionsApart}</button>
                             </div>
                             <div id="mediaInfoContent"></div>
 
@@ -184,43 +187,42 @@
                 </div>
                 <div id="additionalPartsCollapsible" class="detailSection hide">
                     <div class="detailSectionHeader">
-                        Additional Parts
+                        ${HeaderAdditionalParts}
                     </div>
                     <div id="additionalPartsContent" class="detailSectionContent"></div>
                 </div>
                 <div id="castCollapsible" style="display: none;" class="detailSection">
                     <div id="peopleHeader" class="detailSectionHeader">
-                        Cast & Crew
+                        ${HeaderCastCrew}
                     </div>
                     <div id="castContent" class="detailSectionContent"></div>
                 </div>
                 <div id="specialsCollapsible" class="detailSection hide">
                     <div class="detailSectionHeader">
-                        Special Features
+                        ${HeaderSpecialFeatures}
                     </div>
                     <div id="specialsContent" class="detailSectionContent"></div>
                 </div>
                 <div id="musicVideosCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Music Videos
+                        ${HeaderMusicVideos}
                     </div>
                     <div id="musicVideosContent" class="detailSectionContent"></div>
                 </div>
                 <div id="soundtracksCollapsible" style="display: none;" class="detailSection">
                     <div id="soundtracksHeader" class="detailSectionHeader">
-                        Soundtracks
+                        ${HeaderSoundtracks}
                     </div>
                     <div id="soundtracksContent" class="detailSectionContent"></div>
                 </div>
                 <div id="similarCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Similar
                     </div>
                     <div id="similarContent" class="detailSectionContent"></div>
                 </div>
                 <div id="criticReviewsCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Awards and Reviews
+                        ${HeaderAwardsAndReviews}
                     </div>
                     <div style="padding: 0 .5em;">
                         <p id="awardSummary"></p>
@@ -237,20 +239,20 @@
                 </div>
                 <div id="scenesCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Scenes
+                        ${HeaderScenes}
                     </div>
                     <div id="scenesContent" class="detailSectionContent"></div>
                 </div>
                 <div id="themeSongsCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Theme Songs
+                        ${HeaderThemeSongs}
                     </div>
                     <div id="themeSongsContent" class="detailSectionContent"></div>
                 </div>
 
                 <div id="themeVideosCollapsible" style="display: none;" class="detailSection">
                     <div class="detailSectionHeader">
-                        Theme Videos
+                        ${HeaderThemeVideos}
                     </div>
                     <div id="themeVideosContent" class="detailSectionContent"></div>
                 </div>
diff --git a/dashboard-ui/itemgallery.html b/dashboard-ui/itemgallery.html
index 9c35bf0766..49a9ae07f5 100644
--- a/dashboard-ui/itemgallery.html
+++ b/dashboard-ui/itemgallery.html
@@ -15,7 +15,7 @@
 
                 <div id="galleryCollapsible" class="detailSection">
                     <div class="detailSectionHeader">
-                        Gallery
+                        ${HeaderGallery}
                     </div>
                     <div id="galleryContent" class="detailSectionContent"></div>
                 </div>
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html
index a614a14186..343a07a059 100644
--- a/dashboard-ui/itemlist.html
+++ b/dashboard-ui/itemlist.html
@@ -11,15 +11,15 @@
 
             <h1 class="listHeader" style="margin: 0; text-align: center;"><span id="itemName"></span>
                 <span id="editButtonContainer" style="display: none; margin-left: .5em;">
-                    <button id="btnEdit" type="button" data-icon="edit" data-inline="true" data-mini="true">Edit</button>
+                    <button id="btnEdit" type="button" data-icon="edit" data-inline="true" data-mini="true">${ButtonEdit}</button>
                 </span>
             </h1>
             <div class="viewSettings">
                 <div class="viewControls">
                     <div style="display: inline-block;">
                         <select data-mini="true" data-inline="true" id="selectView" name="selectView">
-                            <option value="Backdrop">Backdrop</option>
-                            <option value="Poster">Poster</option>
+                            <option value="Backdrop">${OptionBackdrop}</option>
+                            <option value="Poster">${OptionPoster}</option>
                         </select>
                     </div>
                 </div>
@@ -41,7 +41,7 @@
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
-                    <label for="radioSortName">Name</label>
+                    <label for="radioSortName">${OptionNameSort}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
                     <label for="radioCommunityRating">${OptionCommunityRating}</label>
@@ -62,7 +62,7 @@
                     <label for="radioRuntime">${OptionRuntime}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioIsFolder" value="off" data-sortby="IsFolder,SortName" data-mini="true">
-                    <label for="radioIsFolder">Folders</label>
+                    <label for="radioIsFolder">${OptionFolderSort}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 5830d889f2..6e281c9902 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title></title>
+    <title>${TitleMediaLibrary}</title>
 </head>
 <body>
     <div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage">
@@ -9,22 +9,22 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="#" data-role="button" class="ui-btn-active">Folders</a>
-                    <a href="librarypathmapping.html" data-role="button">Path Substitution</a>
+                    <a href="#" data-role="button" class="ui-btn-active">${TabFolders}</a>
+                    <a href="librarypathmapping.html" data-role="button">${TabPathSubstitution}</a>
                     <a href="librarysettings.html" data-role="button">${TabAdvanced}</a>
                 </div>
                 <div class="readOnlyContent">
-                    <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>
+                    <p style="margin: 2em 0;"><a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">${ReferToMediaLibraryWiki}</a></p>
                     <div id="divMediaLibrary">
                         <p>
-                            <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
+                            <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">${ButtonAddMediaFolder}</button>
                         </p>
                         <div id="divVirtualFolders"></div>
                     </div>
 
                     <br />
                     <div class="readOnlyContent refreshLibraryPanel hide">
-                        <button type="button" class="btnRefresh" data-icon="refresh" data-mini="true">Scan Library</button>
+                        <button type="button" class="btnRefresh" data-icon="refresh" data-mini="true">${ButtonScanLibrary}</button>
                         <progress max="100" min="0" style="width: 100%;" class="refreshProgress"></progress>
                         <div style="margin-top: 5px;">Last Result: <span class="lastRefreshResult"></span></div>
                     </div>
@@ -35,31 +35,31 @@
         <div data-role="popup" data-transition="slidefade" id="popupEnterText" class="popup">
 
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-                <h3>Rename Media Folder</h3>
+                <h3></h3>
             </div>
 
             <div data-role="content">
                 <form id="textEntryForm">
                     <p>
-                        <label id="lblValue" for="txtValue">New name:</label>
+                        <label id="lblValue" for="txtValue"></label>
                         <input type="text" name="txtValue" id="txtValue" required="required" />
                     </p>
 
                     <p id="fldCollectionType">
-                        <label for="selectCollectionType">Folder type:</label>
+                        <label for="selectCollectionType">${LabelFolderType}</label>
                         <select id="selectCollectionType" name="selectCollectionType"></select>
                     </p>
 
                     <p class="collectionTypeFieldDescription">
-                        * Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.
+                        ${MediaFolderHelpPluginRequired}
                     </p>
 
                     <p>
                         <button type="submit" data-theme="b" data-icon="check">
-                            Ok
+                            ${ButtonOk}
                         </button>
                         <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');">
-                            Cancel
+                            ${ButtonCancel}
                         </button>
                     </p>
                 </form>
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 1478622438..4d056e09cf 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Library</title>
+    <title>${TitleMediaLibrary}</title>
 </head>
 <body>
     <div id="libraryPathMappingPage" data-role="page" class="page type-interior mediaLibraryPage">
@@ -9,21 +9,21 @@
         <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">Folders</a>
-                    <a href="#" data-role="button" class="ui-btn-active">Path Substitution</a>
+                    <a href="library.html" data-role="button">${TabFolders}</a>
+                    <a href="#" data-role="button" class="ui-btn-active">${TabPathSubstitution}</a>
                     <a href="librarysettings.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
                 <div class="readOnlyContent">
-                    <p>Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.</p>
+                    <p>${PathSubstitutionHelp}</p>
                 </div>
 
                 <table id="tblPaths" data-role="table" data-mode="reflow" class="ui-responsive">
                     <thead>
                         <tr>
                             <th></th>
-                            <th>From</th>
-                            <th>To</th>
+                            <th>${HeaderFrom}</th>
+                            <th>${HeaderTo}</th>
                         </tr>
                     </thead>
                     <tbody class="tbodyPathSubstitutions">
@@ -35,21 +35,21 @@
                 <form class="libraryPathMappingForm">
 
                     <div>
-                        <h3 class="ui-bar-a" style="padding: .7em 1em;">Add Substitution</h3>
+                        <h3 class="ui-bar-a" style="padding: .7em 1em;">${ButtonAddPathSubstitution}</h3>
                         <div>
-                            <label for="txtFrom">From:</label>
+                            <label for="txtFrom">${LabelFrom}</label>
                             <input id="txtFrom" type="text" required="required" data-mini="true" />
-                            <div class="fieldDescription">Example: D:\Movies (on the server)</div>
+                            <div class="fieldDescription">${LabelFromHelp}</div>
                         </div>
                         <br />
                         <div>
-                            <label for="txtTo">To:</label>
+                            <label for="txtTo">${LabelTo}</label>
                             <input id="txtTo" type="text" required="required" data-mini="true" />
-                            <div class="fieldDescription">Example: \\MyServer\Movies (a path clients can access)</div>
+                            <div class="fieldDescription">${LabelToHelp}</div>
                         </div>
                         <br />
                         <p>
-                            <button type="submit" data-mini="true" data-icon="plus">Add</button>
+                            <button type="submit" data-mini="true" data-icon="plus">${ButtonAdd}</button>
                         </p>
                     </div>
 
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 25a0195ea3..50d924ddbc 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Library</title>
+    <title>${TitleMediaLibrary}</title>
 </head>
 <body>
     <div id="librarySettingsPage" data-role="page" class="page type-interior mediaLibraryPage">
@@ -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="library.html" data-role="button">Folders</a>
-                    <a href="librarypathmapping.html" data-role="button">Path Substitution</a>
+                    <a href="library.html" data-role="button">${TabFolders}</a>
+                    <a href="librarypathmapping.html" data-role="button">${TabPathSubstitution}</a>
                     <a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
                 </div>
 
@@ -19,21 +19,21 @@
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <input type="checkbox" id="chkEnableRealtimeMonitor" name="chkEnableRealtimeMonitor" />
-                            <label for="chkEnableRealtimeMonitor">Enable real time monitoring</label>
+                            <label for="chkEnableRealtimeMonitor">${LabelEnableRealtimeMonitor}</label>
                             <div class="fieldDescription">
-                                Changes will be processed immediately, on supported file systems.
+                                ${LabelEnableRealtimeMonitorHelp}
                             </div>
                         </li>
                         <li>
-                            <label for="txtSeasonZeroName">Season 0 display name: </label>
+                            <label for="txtSeasonZeroName">${LabelSeasonZeroDisplayName}</label>
                             <input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" required="required" />
                         </li>
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">
-                                Save
+                                ${ButtonSave}
                             </button>
                             <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
-                                Cancel
+                                ${ButtonCancel}
                             </button>
                         </li>
                     </ul>
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 3d787edae9..6e4e29035d 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -23,11 +23,11 @@
                 <br />
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true" class="seriesTimerTabs">
                     <input type="radio" name="radioSeriesTimerTab" class="radioSeriesTimerTab" id="radioSettings" value="settings">
-                    <label for="radioSettings">Settings</label>
+                    <label for="radioSettings">${TabSettings}</label>
                     <input type="radio" name="radioSeriesTimerTab" class="radioSeriesTimerTab" id="radioRecordings" value="recordings">
-                    <label for="radioRecordings">Recordings</label>
+                    <label for="radioRecordings">${TabRecordings}</label>
                     <input type="radio" name="radioSeriesTimerTab" class="radioSeriesTimerTab" id="radioScheduled" value="schedule">
-                    <label for="radioScheduled">Schedule</label>
+                    <label for="radioScheduled">${TabScheduled}</label>
                 </div>
                 <br />
                 <br />
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index 5ffa891d75..2d84be4490 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Live TV</title>
+    <title>${TitleLiveTV}</title>
 </head>
 <body>
     <div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvSettingsPage">
@@ -18,16 +18,16 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="selectActiveService">Active service: </label>
+                            <label for="selectActiveService">${LabelActiveService}</label>
                             <select id="selectActiveService" data-mini="true">
                             </select>
-                            <div class="fieldDescription">Multiple tv plugins can be installed but only one can be active at a time.</div>
+                            <div class="fieldDescription">${LabelActiveServiceHelp}</div>
                         </li>
 
                         <li>
-                            <label for="selectGuideDays">Number of days of guide data to download: </label>
+                            <label for="selectGuideDays">${LabelNumberOfGuideDays}</label>
                             <select id="selectGuideDays" data-mini="true">
-                                <option value="">Auto</option>
+                                <option value="">${OptionAutomatic}</option>
                                 <option value="1">1</option>
                                 <option value="2">2</option>
                                 <option value="3">3</option>
@@ -36,17 +36,17 @@
                                 <option value="6">6</option>
                                 <option value="7">7</option>
                             </select>
-                            <div class="fieldDescription">Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.</div>
+                            <div class="fieldDescription">${LabelNumberOfGuideDaysHelp}</div>
                         </li>
                     </ul>
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">
-                                Save
+                                ${ButtonSave}
                             </button>
                             <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
-                                Cancel
+                                ${ButtonCancel}
                             </button>
                         </li>
                     </ul>
@@ -54,9 +54,9 @@
                 </form>
                 <div class="noLiveTvServices" style="display: none;">
                     <div class="readOnlyContent" style="margin-top: 2em;">
-                        <p>A Live TV service provider plugin is required in order to continue.</p>
+                        <p>${LiveTvPluginRequired}</p>
 
-                        <p>Please <a href="plugincatalog.html">install</a> one of our available plugins, such as ServerWmc.</p>
+                        <p><a href="plugincatalog.html">${LiveTvPluginRequiredHelp}</a></p>
                     </div>
                 </div>
             </div>
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 435b887275..37529a0aa8 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Live TV</title>
+    <title>${TitleLiveTV}</title>
 </head>
 <body>
     <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage">
@@ -32,7 +32,7 @@
                         </div>
 
                         <br />
-                        <h2>Tuners</h2>
+                        <h2>${HeaderTvTuners}</h2>
 
                         <table data-role="table" data-mode="reflow" class="tblTuners stripedTable ui-responsive table-stroke">
                             <thead>
@@ -52,9 +52,9 @@
 
                     <div class="noLiveTvServices" style="display: none;">
 
-                        <p>A Live TV service provider plugin is required in order to continue.</p>
+                        <p>${LiveTvPluginRequired}</p>
 
-                        <p><a href="plugincatalog.html">Please install one of our available plugins, such as ServerWmc.</a></p>
+                        <p><a href="plugincatalog.html">${LiveTvPluginRequiredHelp}</a></p>
                     </div>
                 </div>
             </div>
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 620014b19d..c0697b8798 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -19,8 +19,7 @@
                     <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
-                <p>Customize options per media type</p>
-
+                <p>${HeaderCustomizeOptionsPerMediaType}</p>
 
                 <div class="tabs">
                 </div>
@@ -39,79 +38,79 @@
                         </div>
 
                         <div data-role="collapsible">
-                            <h2>Image Settings</h2>
+                            <h2>${HeaderImageSettings}</h2>
                             <div>
                                 <br />
                                 <div class="backdropFields" style="margin-bottom: 2em; display: none;">
                                     <div>
-                                        <label for="txtMaxBackdrops">Maximum number of backdrops per item: </label>
+                                        <label for="txtMaxBackdrops">${LabelMaxBackdropsPerItem}</label>
                                         <input type="number" id="txtMaxBackdrops" name="txtMaxBackdrops" pattern="[0-9]*" required="required" min="0" data-mini="true" />
                                     </div>
                                     <br />
                                     <div>
-                                        <label for="txtMinBackdropDownloadWidth">Minimum backdrop download width: </label>
+                                        <label for="txtMinBackdropDownloadWidth">${LabelMinBackdropDownloadWidth}</label>
                                         <input type="number" id="txtMinBackdropDownloadWidth" name="txtMinBackdropDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
                                     </div>
                                 </div>
 
                                 <div class="screenshotFields" style="margin-bottom: 2em; display: none;">
                                     <div>
-                                        <label for="txtMaxScreenshots">Maximum number of screenshots per item: </label>
+                                        <label for="txtMaxScreenshots">${LabelMaxScreenshotsPerItem}</label>
                                         <input type="number" id="txtMaxScreenshots" name="txtMaxScreenshots" pattern="[0-9]*" required="required" min="0" data-mini="true" />
                                     </div>
 
                                     <div>
-                                        <label for="txtMinScreenshotDownloadWidth">Minimum screenshot download width: </label>
+                                        <label for="txtMinScreenshotDownloadWidth">${LabelMinScreenshotDownloadWidth}</label>
                                         <input type="number" id="txtMinScreenshotDownloadWidth" name="txtMinScreenshotDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
                                     </div>
                                 </div>
 
                                 <fieldset class="imageSelections" data-role="controlgroup" style="border-bottom: 1px solid #ddd;">
-                                    <legend>Fetch Images:</legend>
+                                    <legend>${HeaderFetchImages}</legend>
                                     <div class="imageType" data-imagetype="Primary" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadPrimary" name="chkDownloadPrimary" />
-                                        <label for="chkDownloadPrimary">Primary</label>
+                                        <label for="chkDownloadPrimary">${OptionDownloadPrimaryImage}</label>
                                     </div>
 
 
                                     <div class="imageType" data-imagetype="Art" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadArt" name="chkDownloadArt" />
-                                        <label for="chkDownloadArt">Art</label>
+                                        <label for="chkDownloadArt">${OptionDownloadArtImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="BoxRear" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkBack" name="chkBack" />
-                                        <label for="chkBack">Back</label>
+                                        <label for="chkBack">${OptionDownloadBackImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Banner" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadBanner" name="chkDownloadBanner" />
-                                        <label for="chkDownloadBanner">Banner</label>
+                                        <label for="chkDownloadBanner">${OptionDownloadBannerImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Box" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadBox" name="chkDownloadBox" />
-                                        <label for="chkDownloadBox">Box</label>
+                                        <label for="chkDownloadBox">${OptionDownloadBoxImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Disc" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadDisc" name="chkDownloadDisc" />
-                                        <label for="chkDownloadDisc">Disc</label>
+                                        <label for="chkDownloadDisc">${OptionDownloadDiscImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Logo" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadLogo" name="chkDownloadLogo" />
-                                        <label for="chkDownloadLogo">Logo</label>
+                                        <label for="chkDownloadLogo">${OptionDownloadLogoImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Menu" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadMenu" name="chkDownloadMenu" />
-                                        <label for="chkDownloadMenu">Menu</label>
+                                        <label for="chkDownloadMenu">${OptionDownloadMenuImage}</label>
                                     </div>
 
                                     <div class="imageType" data-imagetype="Thumb" style="display: none;">
                                         <input type="checkbox" data-mini="true" id="chkDownloadThumb" name="chkDownloadThumb" />
-                                        <label for="chkDownloadThumb">Thumb</label>
+                                        <label for="chkDownloadThumb">${OptionDownloadThumbImage}</label>
                                     </div>
                                 </fieldset>
                             </div>
diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html
index 9a085b18e2..ff6d2ee2a5 100644
--- a/dashboard-ui/playlist.html
+++ b/dashboard-ui/playlist.html
@@ -6,7 +6,7 @@
 <body>
     <div id="playlistPage" data-role="page" class="page libraryPage" data-theme="b">
 
-        <div class="parentName">${HeaderNowPlaying}</div>
+        <div class="parentName" style="text-align: center;">${HeaderNowPlaying}</div>
         <div data-role="content">
 
             <div id="playlist" class="detailTableContainer">
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index f101edb038..a09f705600 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -11,7 +11,7 @@
                     <p id="pTaskDescription"></p>
                     <p>
                         <button type="button" data-icon="plus" onclick="ScheduledTaskPage.showAddTriggerPopup();">
-                            Add Task Trigger
+                            ${ButtonAddScheduledTaskTrigger}
                         </button>
                     </p>
                     <ul id="ulTaskTriggers" data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="minus"></ul>
@@ -21,45 +21,45 @@
         <div data-role="popup" id="popupAddTrigger" class="popup" style="min-width: 300px;">
             <form class="addTriggerForm">
                 <div class="ui-bar-b" style="text-align: center; padding: 0 20px;">
-                    <h3>Add Task Trigger</h3>
+                    <h3>${HeaderAddScheduledTaskTrigger}</h3>
                 </div>
                 <div data-role="content">
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="selectTriggerType">Trigger Type:</label>
+                            <label for="selectTriggerType">${LabelTriggerType}</label>
                             <select id="selectTriggerType" name="selectTriggerType" onchange="ScheduledTaskPage.refreshTriggerFields(this.value);">
-                                <option value="DailyTrigger">Daily</option>
-                                <option value="WeeklyTrigger">Weekly</option>
-                                <option value="IntervalTrigger">On an interval</option>
-                                <option value="StartupTrigger">On application startup</option>
-                                <option value="SystemEventTrigger">After a system event</option>
+                                <option value="DailyTrigger">${OptionDaily}</option>
+                                <option value="WeeklyTrigger">${OptionWeekly}</option>
+                                <option value="IntervalTrigger">${OptionOnInterval}</option>
+                                <option value="StartupTrigger">${OptionOnAppStartup}</option>
+                                <option value="SystemEventTrigger">${OptionAfterSystemEvent}</option>
                             </select>
                         </li>
                         <li id="fldDayOfWeek">
-                            <label for="selectDayOfWeek">Day:</label>
+                            <label for="selectDayOfWeek">${LabelDay}</label>
                             <select id="selectDayOfWeek" name="selectDayOfWeek">
-                                <option value="Sunday">Sunday</option>
-                                <option value="Monday">Monday</option>
-                                <option value="Tuesday">Tuesday</option>
-                                <option value="Wednesday">Wednesday</option>
-                                <option value="Thursday">Thursday</option>
-                                <option value="Friday">Friday</option>
-                                <option value="Saturday">Saturday</option>
+                                <option value="Sunday">${OptionSunday}</option>
+                                <option value="Monday">${OptionMonday}</option>
+                                <option value="Tuesday">${OptionTuesday}</option>
+                                <option value="Wednesday">${OptionWednesday}</option>
+                                <option value="Thursday">${OptionThursday}</option>
+                                <option value="Friday">${OptionFriday}</option>
+                                <option value="Saturday">${OptionSaturday}</option>
                             </select>
                         </li>
                         <li id="fldTimeOfDay">
-                            <label for="txtTimeOfDay">Time:</label>
+                            <label for="txtTimeOfDay">${LabelTime}</label>
                             <input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" />
                         </li>
                         <li id="fldSelectSystemEvent">
-                            <label for="selectSystemEvent">Event:</label>
+                            <label for="selectSystemEvent">${LabelEvent}</label>
                             <select id="selectSystemEvent" name="selectSystemEvent">
-                                <option value="WakeFromSleep">Wake from sleep</option>
+                                <option value="WakeFromSleep">${OptionWakeFromSleep}</option>
                             </select>
                         </li>
                         <li id="fldSelectInterval">
-                            <label for="selectInterval">Every:</label>
+                            <label for="selectInterval">${LabelEveryXMinutes}</label>
                             <select id="selectInterval" name="selectInterval">
                                 <option value="9000000000">15 minutes</option>
                                 <option value="18000000000">30 minutes</option>
@@ -75,10 +75,10 @@
                         </li>
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">
-                                Add
+                                ${ButtonAdd}
                             </button>
                             <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');">
-                                Cancel
+                                ${ButtonCancel}
                             </button>
                         </li>
                     </ul>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index cc30089e72..dfb211199f 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -11,7 +11,7 @@
         Dashboard.showLoadingMsg();
         DashboardPage.pollForInfo(page);
         DashboardPage.startInterval();
-        
+
         $(ApiClient).on("websocketmessage", DashboardPage.onWebSocketMessage)
             .on("websocketopen", DashboardPage.onWebSocketConnectionChange)
             .on("websocketerror", DashboardPage.onWebSocketConnectionChange)
@@ -173,7 +173,7 @@
     pollForInfo: function (page) {
 
         ApiClient.getSessions().done(function (sessions) {
-            
+
             DashboardPage.renderInfo(page, sessions);
         });
     },
@@ -360,9 +360,13 @@
             return "<img src='css/images/clients/mbkinect.png' alt='MB Kinect' />";
         }
         if (clientLowered == "xbmc") {
-
             return "<img src='css/images/clients/xbmc.png' alt='Xbmc' />";
         }
+        if (clientLowered == "chromecast") {
+
+            return "<img src='css/images/chromecast/ic_media_route_on_holo_light.png' alt='Chromecast' />";
+        }
+
 
         return connection.Client;
     },
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index a42766de23..cf7750b234 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -75,20 +75,6 @@
         renderResponseProfiles(page, profile.ResponseProfiles);
     }
 
-    function editDirectPlayProfile(page, directPlayProfile) {
-
-        isSubProfileNew = directPlayProfile == null;
-        directPlayProfile = directPlayProfile || {};
-        currentSubProfile = directPlayProfile;
-
-        var popup = $('#popupEditDirectPlayProfile', page).popup('open');
-
-        $('#selectDirectPlayProfileType', popup).val(directPlayProfile.Type || 'Video').selectmenu('refresh').trigger('change');
-        $('#txtDirectPlayContainer', popup).val(directPlayProfile.Container || '');
-        $('#txtDirectPlayAudioCodec', popup).val(directPlayProfile.AudioCodec || '');
-        $('#txtDirectPlayVideoCodec', popup).val(directPlayProfile.VideoCodec || '');
-    }
-
     function saveDirectPlayProfile(page) {
 
         currentSubProfile.Type = $('#selectDirectPlayProfileType', page).val();
@@ -171,6 +157,22 @@
 
     }
 
+    function editDirectPlayProfile(page, directPlayProfile) {
+
+        isSubProfileNew = directPlayProfile == null;
+        directPlayProfile = directPlayProfile || {};
+        currentSubProfile = directPlayProfile;
+
+        var popup = $('#popupEditDirectPlayProfile', page);
+
+        $('#selectDirectPlayProfileType', popup).val(directPlayProfile.Type || 'Video').selectmenu('refresh').trigger('change');
+        $('#txtDirectPlayContainer', popup).val(directPlayProfile.Container || '');
+        $('#txtDirectPlayAudioCodec', popup).val(directPlayProfile.AudioCodec || '');
+        $('#txtDirectPlayVideoCodec', popup).val(directPlayProfile.VideoCodec || '');
+        
+        popup.popup('open');
+    }
+
     function renderTranscodingProfiles(page, profiles) {
 
         var html = '';
@@ -233,7 +235,7 @@
         transcodingProfile = transcodingProfile || {};
         currentSubProfile = transcodingProfile;
 
-        var popup = $('#transcodingProfilePopup', page).popup('open');
+        var popup = $('#transcodingProfilePopup', page);
 
         $('#selectTranscodingProfileType', popup).val(transcodingProfile.Type || 'Video').selectmenu('refresh').trigger('change');
         $('#txtTranscodingContainer', popup).val(transcodingProfile.Container || '');
@@ -246,6 +248,8 @@
         $('#chkReportByteRangeRequests', popup).checked(transcodingProfile.TranscodeSeekInfo == 'Bytes').checkboxradio('refresh');
 
         $('.radioTabButton:first', popup).checked(true).checkboxradio('refresh').trigger('change');
+        
+        popup.popup('open');
     }
 
     function deleteTranscodingProfile(page, index) {
@@ -351,10 +355,14 @@
         containerProfile = containerProfile || {};
         currentSubProfile = containerProfile;
 
-        var popup = $('#containerProfilePopup', page).popup('open');
+        var popup = $('#containerProfilePopup', page);
 
         $('#selectContainerProfileType', popup).val(containerProfile.Type || 'Video').selectmenu('refresh').trigger('change');
         $('#txtContainerProfileContainer', popup).val(containerProfile.Container || '');
+
+        $('.radioTabButton:first', popup).checked(true).checkboxradio('refresh').trigger('change');
+        
+        popup.popup('open');
     }
 
     function saveContainerProfile(page) {
@@ -447,10 +455,14 @@
         codecProfile = codecProfile || {};
         currentSubProfile = codecProfile;
 
-        var popup = $('#codecProfilePopup', page).popup('open');
+        var popup = $('#codecProfilePopup', page);
 
         $('#selectCodecProfileType', popup).val(codecProfile.Type || 'Video').selectmenu('refresh').trigger('change');
         $('#txtCodecProfileCodec', popup).val(codecProfile.Codec || '');
+
+        $('.radioTabButton:first', popup).checked(true).checkboxradio('refresh').trigger('change');
+        
+        popup.popup('open');
     }
 
     function saveCodecProfile(page) {
@@ -525,6 +537,13 @@
             var index = this.getAttribute('data-profileindex');
             deleteResponseProfile(page, index);
         });
+
+        $('.lnkEditSubProfile', elem).on('click', function () {
+
+            var index = parseInt(this.getAttribute('data-profileindex'));
+            
+            editResponseProfile(page, currentProfile.ResponseProfiles[index]);
+        });
     }
 
     function deleteResponseProfile(page, index) {
@@ -532,7 +551,43 @@
         currentProfile.ResponseProfiles.splice(index, 1);
 
         renderResponseProfiles(page, currentProfile.ResponseProfiles);
+    }
 
+    function editResponseProfile(page, responseProfile) {
+
+        isSubProfileNew = responseProfile == null;
+        responseProfile = responseProfile || {};
+        currentSubProfile = responseProfile;
+
+        var popup = $('#responseProfilePopup', page);
+
+        $('#selectResponseProfileType', popup).val(responseProfile.Type || 'Video').selectmenu('refresh').trigger('change');
+        $('#txtResponseProfileContainer', popup).val(responseProfile.Container || '');
+        $('#txtResponseProfileAudioCodec', popup).val(responseProfile.AudioCodec || '');
+        $('#txtResponseProfileVideoCodec', popup).val(responseProfile.VideoCodec || '');
+
+        $('.radioTabButton:first', popup).checked(true).checkboxradio('refresh').trigger('change');
+
+        popup.popup('open');
+    }
+
+    function saveResponseProfile(page) {
+
+        currentSubProfile.Type = $('#selectResponseProfileType', page).val();
+        currentSubProfile.Container = $('#txtResponseProfileContainer', page).val();
+        currentSubProfile.AudioCodec = $('#txtResponseProfileAudioCodec', page).val();
+        currentSubProfile.VideoCodec = $('#txtResponseProfileVideoCodec', page).val();
+
+        if (isSubProfileNew) {
+
+            currentProfile.ResponseProfiles.push(currentSubProfile);
+        }
+
+        renderSubProfiles(page, currentProfile);
+
+        currentSubProfile = null;
+
+        $('#responseProfilePopup', page).popup('close');
     }
 
     function saveProfile(page, profile) {
@@ -648,6 +703,22 @@
 
         });
 
+        $('#selectResponseProfileType', page).on('change', function () {
+
+            if (this.value == 'Video') {
+                $('#fldResponseProfileVideoCodec', page).show();
+            } else {
+                $('#fldResponseProfileVideoCodec', page).hide();
+            }
+
+            if (this.value == 'Photo') {
+                $('#fldResponseProfileAudioCodec', page).hide();
+            } else {
+                $('#fldResponseProfileAudioCodec', page).show();
+            }
+
+        });
+
         $('.btnAddDirectPlayProfile', page).on('click', function () {
 
             editDirectPlayProfile(page);
@@ -672,6 +743,12 @@
 
         });
 
+        $('.btnAddResponseProfile', page).on('click', function () {
+
+            editResponseProfile(page);
+
+        });
+
     }).on('pageshow', "#dlnaProfilePage", function () {
 
         var page = this;
@@ -737,6 +814,15 @@
 
             saveCodecProfile(page);
 
+            return false;
+        },
+        
+        onResponseProfileFormSubmit: function() {
+            var form = this;
+            var page = $(form).parents('.page');
+
+            saveResponseProfile(page);
+
             return false;
         }
     };
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 5aa253812f..4122b9740a 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -46,42 +46,41 @@
                 LibraryBrowser.renderDetailPageBackdrop(page, item);
 
                 if (user.Configuration.IsAdministrator) {
-                    $('#editButtonContainer', page).show();
+                    $('.btnEdit', page).removeClass('hide');
 
                 } else {
-                    $('#editButtonContainer', page).hide();
+                    $('.btnEdit', page).addClass('hide');
                 }
 
                 var externalPlayUrl = getExternalPlayUrl(item);
-                $('#btnPlayExternal', page).attr('href', externalPlayUrl || '#');
+                $('.btnPlayExternal', page).attr('href', externalPlayUrl || '#');
 
                 if (externalPlayUrl) {
-                    $('#playExternalButtonContainer', page).show();
-                    $('#playButtonContainer', page).hide();
+                    $('.btnPlayExternal', page).removeClass('hide');
+                    $('.btnPlay', page).addClass('hide');
                 }
                 else if (MediaController.canPlay(item)) {
-                    $('#playButtonContainer', page).show();
-                    $('#playExternalButtonContainer', page).hide();
+                    $('.btnPlay', page).removeClass('hide');
+                    $('.btnPlayExternal', page).addClass('hide');
                 }
                 else {
-                    $('#playButtonContainer', page).hide();
-                    $('#playExternalButtonContainer', page).hide();
+                    $('.btnPlay', page).addClass('hide');
+                    $('.btnPlayExternal', page).addClass('hide');
                 }
 
                 if (item.LocalTrailerCount && item.PlayAccess == 'Full') {
-                    $('#trailerButtonContainer', page).show();
+                    $('.btnPlayTrailer', page).removeClass('hide');
                 } else {
-                    $('#trailerButtonContainer', page).hide();
+                    $('.btnPlayTrailer', page).addClass('hide');
                 }
 
                 if (!item.LocalTrailerCount && item.RemoteTrailers.length && item.PlayAccess == 'Full') {
-                    $('#externalTrailerButtonContainer', page).show();
-
-                    $('#btnPlayExternalTrailer', page).attr('href', item.RemoteTrailers[0].Url);
+                    
+                    $('.btnPlayExternalTrailer', page).removeClass('hide').attr('href', item.RemoteTrailers[0].Url);
 
                 } else {
-                    $('#externalTrailerButtonContainer', page).hide();
-                    $('#btnPlayExternalTrailer', page).attr('href', '#');
+                    
+                    $('.btnPlayExternalTrailer', page).addClass('hide').attr('href', '#');
                 }
 
                 if (user.Configuration.IsAdministrator && item.MediaSources && item.MediaSources.length > 1) {
@@ -93,10 +92,10 @@
 
             if (item.LocationType == "Offline") {
 
-                $('#offlineIndicator', page).show();
+                $('.offlineIndicator', page).show();
             }
             else {
-                $('#offlineIndicator', page).hide();
+                $('.offlineIndicator', page).hide();
             }
 
             var isMissingEpisode = false;
@@ -113,10 +112,10 @@
 
             if (isMissingEpisode) {
 
-                $('#missingIndicator', page).show();
+                $('.missingIndicator', page).show();
             }
             else {
-                $('#missingIndicator', page).hide();
+                $('.missingIndicator', page).hide();
             }
 
             setPeopleHeader(page, item);
@@ -128,9 +127,7 @@
             Dashboard.hideLoadingMsg();
         });
 
-
-
-        $('#btnEdit', page).attr('href', "edititemmetadata.html?id=" + id);
+        $('.btnEdit', page).attr('href', "edititemmetadata.html?id=" + id);
     }
 
     function setPeopleHeader(page, item) {
@@ -1332,7 +1329,7 @@
 
         var page = this;
 
-        $('#btnPlay', page).on('click', function () {
+        $('.btnPlay', page).on('click', function () {
             var userdata = currentItem.UserData || {};
 
             var mediaType = currentItem.MediaType;
@@ -1344,11 +1341,11 @@
             LibraryBrowser.showPlayMenu(this, currentItem.Id, currentItem.Type, currentItem.IsFolder, mediaType, userdata.PlaybackPositionTicks);
         });
 
-        $('#btnPlayTrailer', page).on('click', function () {
+        $('.btnPlayTrailer', page).on('click', function () {
             playTrailer(page);
         });
 
-        $('#btnPlayExternal', page).on('click', function () {
+        $('.btnPlayExternal', page).on('click', function () {
 
             ApiClient.markPlayed(Dashboard.getCurrentUserId(), currentItem.Id, new Date());
         });
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 8dc473f6bb..6c18da00f3 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -338,6 +338,10 @@
 
         getHref: function (item, itemByNameContext) {
 
+            if (!item) {
+                throw new Error('item cannot be null');
+            }
+            
             if (item.url) {
                 return item.url;
             }
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 4b79a545ac..495301581f 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -18,6 +18,7 @@
                     </div>
 
                     <form id="supporterKeyForm">
+					
                         <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" />
@@ -33,8 +34,9 @@
 
                         </div>
                         <div style="margin: 2em 0;">
+						
                             <label for="txtLegacyKey">MB2 Supporter Key</label>
-                            <input type="password" id="txtLegacyKey" name="txtLegacyKey" data-inline="true" />
+                            <input type="password" id="txtLegacyKey" name="txtLegacyKey" />
                             <div class="fieldDescription">
                                 Some premium plugins may give credit for registrations with previous versions in MB2.
                             </div>
@@ -42,7 +44,6 @@
                         </div>
                         <p>
                             <button type="submit" id="mbLegacyKeyBtn" data-theme="b" data-icon="check">Save</button>
-
                         </p>
                     </form>
                     <br />
@@ -52,7 +53,7 @@
                             <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" />
+                                    <input type="email" required id="txtEmail" name="txtEmail" />
                                     <div class="fieldDescription">The email address that was used to purchase the key.</div>
                                 </div>
                                 <p>
@@ -73,19 +74,19 @@
                                 </p>
                                 <div style="margin: 1em 0;">
                                     <label for="txtEmail">Current Email Address</label>
-                                    <input type="email" required id="txtNewEmail" name="txtNewEmail" data-inline="true" />
+                                    <input type="email" required id="txtNewEmail" name="txtNewEmail" />
                                     <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" />
+                                    <input type="password" required="required" id="txtNewKey" name="txtNewKey" />
                                 </p>
                                 <p>
 
                                     <label for="txtOldKey">Old Supporter Key</label>
-                                    <input type="password" required="required" id="txtOldKey" name="txtOldKey" data-inline="true" />
+                                    <input type="password" required="required" id="txtOldKey" name="txtOldKey" />
                                 </p>
                                 <p>
                                     <button type="submit" id="mbLinkKeysBtn" data-icon="check" data-theme="b">Link Keys</button>