diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index 92d96d45a..b32f9afd3 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -40,7 +40,7 @@
                                 <option value="Dev">Dev (Unstable)</option>
                             </select>
                             <div id="devBuildWarning" class="fieldDescription warningFieldDescription" style="display: none;">
-                                Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all.                          
+                                ${DevBuildWarning}
                             </div>
                         </li>
                         <li id="fldEnableAutomaticRestart" style="display: none;">
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index c414bbf51..431c13a50 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -11,8 +11,8 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -56,10 +56,10 @@
                         <label for="radioSortName">Name</label>
 
                         <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                        <label for="radioCommunityRating">Community Rating</label>
+                        <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                         <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                        <label for="radioDateCreated">Date Added</label>
+                        <label for="radioDateCreated">${OptionDateAdded}</label>
                     </fieldset>
 
                     <fieldset data-role="controlgroup">
@@ -67,10 +67,10 @@
                         </legend>
 
                         <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                        <label for="radioAscending">Ascending</label>
+                        <label for="radioAscending">${OptionAscending}</label>
 
                         <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                        <label for="radioDescending">Descending</label>
+                        <label for="radioDescending">${OptionDescending}</label>
                     </fieldset>
                 </div>
             </form>
@@ -81,13 +81,13 @@
                     <legend>Filters:
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 967e31fb8..6c7148e8a 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -661,10 +661,6 @@ a.itemTag:hover {
     display: inline-block;
 }
 
-.viewMenuRemoteControlButton {
-    margin-left: .5em;
-}
-
 @media all and (min-width: 600px) {
     .inlineDetailSection:not(.hide) {
         display: inline-block;
@@ -676,20 +672,20 @@ a.itemTag:hover {
     }
 }
 
-@media all and (min-width: 880px) {
+@media all and (min-width: 950px) {
 
     .libraryMenuButton {
         display: none;
     }
 }
 
-@media all and (max-width: 880px) {
+@media all and (max-width: 950px) {
 
     .desktopHomeLink {
         display: none;
     }
 
-    .desktopViewMenuLink:not(.selectedViewLink) {
+    .desktopViewMenuLink {
         display: none;
     }
 
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 72ec6c4b3..007940151 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -18,23 +18,23 @@
 
                     <p>Profile Information</p>
                     <div data-role="controlgroup" data-type="horizontal" data-mini="true">
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioInfo" value="tabInfo">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioInfo" value="tabInfo">
                         <label for="radioInfo">Info</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioIdentification" value="tabIdentification">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioIdentification" value="tabIdentification">
                         <label for="radioIdentification">Identification</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioDirectPlay" value="tabDirectPlayProfiles">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioDirectPlay" value="tabDirectPlayProfiles">
                         <label for="radioDirectPlay">Direct Play</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioTranscoding" value="tabTranscodingProfiles">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioTranscoding" value="tabTranscodingProfiles">
                         <label for="radioTranscoding">Transcoding</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioContainers" value="tabContainerProfiles">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioContainers" value="tabContainerProfiles">
                         <label for="radioContainers">Containers</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioCodecs" value="tabCodecProfiles">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioCodecs" value="tabCodecProfiles">
                         <label for="radioCodecs">Codecs</label>
-                        <input type="radio" name="radioProfileTab" class="radioProfileTab" id="radioMediaProfiles" value="tabMediaProfiles">
+                        <input type="radio" name="radioProfileTab" class="radioTabButton" id="radioMediaProfiles" value="tabMediaProfiles">
                         <label for="radioMediaProfiles">Responses</label>
                     </div>
                     <br />
-                    <div class="profileTab tabInfo">
+                    <div class="tabContent tabInfo">
 
                         <ul data-role="listview" class="ulForm">
                             <li>
@@ -65,7 +65,7 @@
                         </ul>
 
                     </div>
-                    <div class="profileTab tabIdentification">
+                    <div class="tabContent tabIdentification">
 
                         <p>Devices have two forms of identification, device properties and HTTP request headers. At least one form should be supplied.</p>
                         <br />
@@ -119,27 +119,27 @@
 
                     </div>
 
-                    <div class="profileTab tabDirectPlayProfiles">
+                    <div class="tabContent tabDirectPlayProfiles">
                         <p>Add direct play profiles to indicate which formats the device can handle natively.</p>
                         <button class="btnAddDirectPlayProfile" type="button" data-mini="true" data-icon="plus">New</button>
                         <br />
                         <div class="directPlayProfiles"></div>
                     </div>
-                    <div class="profileTab tabTranscodingProfiles">
+                    <div class="tabContent tabTranscodingProfiles">
                         <p>Add transcoding profiles to indicate which formats should be used when transcoding is required.</p>
                         <button class="btnAddTranscodingProfile" type="button" data-mini="true" data-icon="plus">New</button>
                         <br />
                         <div class="transcodingProfiles"></div>
                     </div>
-                    <div class="profileTab tabContainerProfiles">
+                    <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>
                         <div class="containerProfiles"></div>
                     </div>
-                    <div class="profileTab tabCodecProfiles">
+                    <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>
                         <div class="codecProfiles"></div>
                     </div>
-                    <div class="profileTab tabMediaProfiles">
+                    <div class="tabContent tabMediaProfiles">
                         <p>Response profiles provide a way to customize responses sent to the device when playing certain kinds of media.</p>
                         <div class="mediaProfiles"></div>
                     </div>
@@ -216,50 +216,61 @@
             <div data-role="content">
                 <form class="transcodingProfileForm" style="min-width: 250px;">
 
-                    <div style="margin: 1em 0;">
-                        <label for="selectTranscodingProfileType">Type:</label>
-                        <select id="selectTranscodingProfileType" data-mini="true">
-                            <option value="Audio">Audio</option>
-                            <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="radioTranscodingTab" class="radioTabButton" id="radioTranscodingBasics" value="tabTranscodingBasics">
+                        <label for="radioTranscodingBasics">Info</label>
+                        <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingAdvanced" value="tabTranscodingAdvanced">
+                        <label for="radioTranscodingAdvanced">Advanced</label>
                     </div>
 
-                    <div style="margin: 1em 0;">
-                        <label for="txtTranscodingContainer">Containers:</label>
-                        <input type="text" id="txtTranscodingContainer" data-mini="true" required="required" />
-                    </div>
+                    <div class="tabContent tabTranscodingBasics" style="display: none;">
+                        <div style="margin: 1em 0;">
+                            <label for="selectTranscodingProfileType">Type:</label>
+                            <select id="selectTranscodingProfileType" data-mini="true">
+                                <option value="Audio">Audio</option>
+                                <option value="Photo">Photo</option>
+                                <option value="Video">Video</option>
+                            </select>
+                        </div>
 
-                    <div id="fldTranscodingVideoCodec" style="margin: 1em 0;">
-                        <label for="txtTranscodingVideoCodec">Video codec:</label>
-                        <input type="text" id="txtTranscodingVideoCodec" data-mini="true" />
-                    </div>
+                        <div style="margin: 1em 0;">
+                            <label for="txtTranscodingContainer">Containers:</label>
+                            <input type="text" id="txtTranscodingContainer" data-mini="true" required="required" />
+                        </div>
 
-                    <div id="fldTranscodingAudioCodec" style="margin: 1em 0;">
-                        <label for="txtTranscodingAudioCodec">Audio codec:</label>
-                        <input type="text" id="txtTranscodingAudioCodec" data-mini="true" />
-                    </div>
+                        <div id="fldTranscodingVideoCodec" style="margin: 1em 0;">
+                            <label for="txtTranscodingVideoCodec">Video codec:</label>
+                            <input type="text" id="txtTranscodingVideoCodec" data-mini="true" />
+                        </div>
 
-                    <div id="fldVideoProfile" style="margin: 1em 0;">
-                        <label for="txtTranscodingVideoProfile">Video profile:</label>
-                        <input type="text" id="txtTranscodingVideoProfile" data-mini="true" />
+                        <div id="fldTranscodingAudioCodec" style="margin: 1em 0;">
+                            <label for="txtTranscodingAudioCodec">Audio codec:</label>
+                            <input type="text" id="txtTranscodingAudioCodec" data-mini="true" />
+                        </div>
                     </div>
+                    <div class="tabContent tabTranscodingAdvanced" style="display: none;">
 
-                    <div id="fldEnableMpegtsM2TsMode" style="margin: 1em 0;">
-                        <label for="chkEnableMpegtsM2TsMode">Enable M2ts mode</label>
-                        <input type="checkbox" id="chkEnableMpegtsM2TsMode" data-mini="true" />
-                        <div class="fieldDescription">Enable m2ts mode when encoding to mpegts.</div>
-                    </div>
+                        <div id="fldVideoProfile" style="margin: 1em 0;">
+                            <label for="txtTranscodingVideoProfile">Video profile:</label>
+                            <input type="text" id="txtTranscodingVideoProfile" data-mini="true" />
+                        </div>
 
-                    <div id="fldEstimateContentLength" style="margin: 1em 0;">
-                        <label for="chkEstimateContentLength">Estimate content length when transcoding</label>
-                        <input type="checkbox" id="chkEstimateContentLength" data-mini="true" />
-                    </div>
+                        <div id="fldEnableMpegtsM2TsMode" style="margin: 1em 0;">
+                            <label for="chkEnableMpegtsM2TsMode">Enable M2ts mode</label>
+                            <input type="checkbox" id="chkEnableMpegtsM2TsMode" data-mini="true" />
+                            <div class="fieldDescription">Enable m2ts mode when encoding to mpegts.</div>
+                        </div>
 
-                    <div id="fldReportByteRangeRequests" style="margin: 1em 0;">
-                        <label for="chkReportByteRangeRequests">Report that the server supports byte seeking when transcoding</label>
-                        <input type="checkbox" id="chkReportByteRangeRequests" data-mini="true" />
-                        <div class="fieldDescription">This is required for some devices that don't time seek very well.</div>
+                        <div id="fldEstimateContentLength" style="margin: 1em 0;">
+                            <label for="chkEstimateContentLength">Estimate content length when transcoding</label>
+                            <input type="checkbox" id="chkEstimateContentLength" data-mini="true" />
+                        </div>
+
+                        <div id="fldReportByteRangeRequests" style="margin: 1em 0;">
+                            <label for="chkReportByteRangeRequests">Report that the server supports byte seeking when transcoding</label>
+                            <input type="checkbox" id="chkReportByteRangeRequests" data-mini="true" />
+                            <div class="fieldDescription">This is required for some devices that don't time seek very well.</div>
+                        </div>
                     </div>
 
                     <p>
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index 1d5fb9cd9..8422b2c2d 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -22,8 +22,8 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
@@ -41,7 +41,7 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSeriesSortName" value="on" checked="checked" data-sortby="SeriesSortName,SortName" data-mini="true">
@@ -54,37 +54,37 @@
                     <label for="radioCommunityRating">Tvdb rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioDateCreated">Date added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate,SeriesSortName,SortName" data-mini="true">
                     <label for="radioPremiereDate">Date aired</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioDatePlayed">Date played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioContentRating" value="off" data-sortby="OfficialRating,SeriesSortName,SortName" data-mini="true">
                     <label for="radioContentRating">Parental rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioPlayCount">Play count</label>
+                    <label for="radioPlayCount">${OptionPlayCount}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SeriesSortName,SortName" data-mini="true">
-                    <label for="radioVideoBitRate">Video bit rate</label>
+                    <label for="radioVideoBitRate">${OptionVideoBitrate}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -92,25 +92,25 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Watched</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unwatched</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
-                    <label for="chkResumable">Resumable</label>
+                    <label for="chkResumable">${OptionResumable}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
 
                     <input type="checkbox" name="chkSpecialFeature" id="chkSpecialFeature" data-mini="true">
                     <label for="chkSpecialFeature">Season 0</label>
diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html
index 4edf4d7c7..a2762d6cc 100644
--- a/dashboard-ui/gamegenres.html
+++ b/dashboard-ui/gamegenres.html
@@ -15,7 +15,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -26,16 +26,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html
index 8b664a615..4f1e25ba4 100644
--- a/dashboard-ui/games.html
+++ b/dashboard-ui/games.html
@@ -17,8 +17,8 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -32,38 +32,38 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </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>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioContentRating" value="off" data-sortby="OfficialRating" data-mini="true">
                     <label for="radioContentRating">Parental Rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -71,22 +71,22 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Played</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unplayed</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html
index 01cd67168..b4dd54998 100644
--- a/dashboard-ui/gamestudios.html
+++ b/dashboard-ui/gamestudios.html
@@ -15,7 +15,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -26,16 +26,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index a57abe94c..a8fc765e9 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -77,23 +77,23 @@
         <div id="musicGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="musicrecommended.html">${TabSuggested}</a>
-                <a href="songs.html">Songs</a>
-                <a href="musicalbums.html">Albums</a>
-                <a href="musicalbumartists.html">Album Artists</a>
-                <a href="musicartists.html">Artists</a>
+                <a href="songs.html">${TabSongs}</a>
+                <a href="musicalbums.html">${TabAlbums}</a>
+                <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+                <a href="musicartists.html">${TabArtists}</a>
                 <a href="musicgenres.html" class="ui-btn-active">${TabGenres}</a>
-                <a href="musicvideos.html">Music Videos</a>
+                <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
         </div>
         <div id="artistTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="musicrecommended.html">${TabSuggested}</a>
-                <a href="songs.html">Songs</a>
-                <a href="musicalbums.html">Albums</a>
-                <a href="musicalbumartists.html">Album Artists</a>
-                <a href="musicartists.html" class="ui-btn-active">Artists</a>
+                <a href="songs.html">${TabSongs}</a>
+                <a href="musicalbums.html">${TabAlbums}</a>
+                <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="ui-btn-active">${TabArtists}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
-                <a href="musicvideos.html">Music Videos</a>
+                <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
         </div>
         <div id="gameGenreTabs" class="itemTabs" style="display: none;">
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 9d30154df..1337974f2 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -42,34 +42,34 @@
         <div id="songTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="musicrecommended.html">${TabSuggested}</a>
-                <a href="songs.html" class="ui-btn-active">Songs</a>
-                <a href="musicalbums.html">Albums</a>
-                <a href="musicalbumartists.html">Album Artists</a>
-                <a href="musicartists.html">Artists</a>
+                <a href="songs.html" class="ui-btn-active">${TabSongs}</a>
+                <a href="musicalbums.html">${TabAlbums}</a>
+                <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+                <a href="musicartists.html">${TabArtists}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
-                <a href="musicvideos.html">Music Videos</a>
+                <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
         </div>
         <div id="albumTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="musicrecommended.html">${TabSuggested}</a>
-                <a href="songs.html">Songs</a>
-                <a href="musicalbums.html" class="ui-btn-active">Albums</a>
-                <a href="musicalbumartists.html">Album Artists</a>
-                <a href="musicartists.html">Artists</a>
+                <a href="songs.html">${TabSongs}</a>
+                <a href="musicalbums.html" class="ui-btn-active">${TabAlbums}</a>
+                <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+                <a href="musicartists.html">${TabArtists}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
-                <a href="musicvideos.html">Music Videos</a>
+                <a href="musicvideos.html">${TabMusicVideos}</a>
             </div>
         </div>
         <div id="musicVideoTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="musicrecommended.html">${TabSuggested}</a>
-                <a href="songs.html">Songs</a>
-                <a href="musicalbums.html">Albums</a>
-                <a href="musicalbumartists.html">Album Artists</a>
-                <a href="musicartists.html">Artists</a>
+                <a href="songs.html">${TabSongs}</a>
+                <a href="musicalbums.html">${TabAlbums}</a>
+                <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+                <a href="musicartists.html">${TabArtists}</a>
                 <a href="musicgenres.html">${TabGenres}</a>
-                <a href="musicvideos.html" class="ui-btn-active">Music Videos</a>
+                <a href="musicvideos.html" class="ui-btn-active">${TabMusicVideos}</a>
             </div>
         </div>
         <div id="gameTabs" class="itemTabs" style="display: none;">
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html
index 3808cc746..b712f0011 100644
--- a/dashboard-ui/itemlist.html
+++ b/dashboard-ui/itemlist.html
@@ -24,8 +24,8 @@
                     </div>
                 </div>
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -37,29 +37,29 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </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>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioContentRating" value="off" data-sortby="OfficialRating" data-mini="true">
                     <label for="radioContentRating">Parental Rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <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>
@@ -67,14 +67,14 @@
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -82,25 +82,25 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Played</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unplayed</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
-                    <label for="chkResumable">Resumable</label>
+                    <label for="chkResumable">${OptionResumable}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/libraryreport.html b/dashboard-ui/libraryreport.html
index 4ff60b77b..b69f3ec0b 100644
--- a/dashboard-ui/libraryreport.html
+++ b/dashboard-ui/libraryreport.html
@@ -37,7 +37,7 @@
                                 <option value="Audio">Songs</option>
                             </select>
                         </div>
-                        <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                        <button data-mini="true" data-icon="filter" data-inline="true" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">${ButtonFilter}</button>
                     </div>
                     <div class="listTopPaging">
                     </div>
@@ -54,7 +54,7 @@
             <form>
 
                 <fieldset data-role="controlgroup" data-type="horizontal" style="margin-bottom: 1em;">
-                    <legend>Filters:</legend>
+                    <legend>${HeaderFilters}</legend>
                     <input type="radio" name="radioFilterTypes" id="radioBasicFilters" value="on" checked="checked" data-mini="true">
                     <label for="radioBasicFilters">Basic</label>
                     <input type="radio" name="radioFilterTypes" id="radioAdvancedFilters" value="off" data-mini="true">
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html
index 2f123b0fc..107cfc2a1 100644
--- a/dashboard-ui/livetvseriestimers.html
+++ b/dashboard-ui/livetvseriestimers.html
@@ -17,7 +17,7 @@
             <div style="max-width: 600px; margin: 0 auto;">
 
                 <div style="text-align: right;">
-                    <button data-mini="true" data-icon="sort" data-inline="true" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
+                    <button data-mini="true" data-icon="sort" data-inline="true" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">${ButtonSort}</button>
                 </div>
 
                 <div id="items"></div>
@@ -28,7 +28,7 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
@@ -40,14 +40,14 @@
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html
index 8c4ce43b4..f8425dbb4 100644
--- a/dashboard-ui/moviegenres.html
+++ b/dashboard-ui/moviegenres.html
@@ -19,7 +19,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -30,16 +30,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html
index 90d827bd3..cd2d59cab 100644
--- a/dashboard-ui/moviepeople.html
+++ b/dashboard-ui/moviepeople.html
@@ -21,7 +21,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -32,32 +32,32 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Person Types:</strong>
+                        <strong>${HeaderPersonTypes}</strong>
                     </legend>
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkActor" id="chkActor" data-filter="Actor" data-mini="true">
-                    <label for="chkActor">Actors</label>
+                    <label for="chkActor">${OptionActors}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkDirector" id="chkDirector" data-filter="Director" data-mini="true">
-                    <label for="chkDirector">Directors</label>
+                    <label for="chkDirector">${OptionDirectors}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkProducer" id="chkProducer" data-filter="Producer" data-mini="true">
-                    <label for="chkProducer">Producers</label>
+                    <label for="chkProducer">${OptionProducers}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkWriter" id="chkWriter" data-filter="Writer" data-mini="true">
-                    <label for="chkWriter">Writers</label>
+                    <label for="chkWriter">${OptionWriters}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index 6bb8ad77a..14ebf8cf0 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -25,13 +25,14 @@
                         <select data-mini="true" data-inline="true" id="selectView" name="selectView">
                             <option value="Thumb">Thumb</option>
                             <option value="Poster">Poster</option>
+                            <option value="Banner">Banner</option>
                             <option value="Timeline">Timeline</option>
                         </select>
                     </div>
                 </div>
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
@@ -50,26 +51,26 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </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="radioBudget" value="off" data-sortby="Budget,SortName" data-mini="true">
-                    <label for="radioBudget">Budget</label>
+                    <label for="radioBudget">${OptionBudget}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SortName" data-mini="true">
                     <label for="radioCommunityRating">IMDb rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCriticRating" value="off" data-sortby="CriticRating,SortName" data-mini="true">
-                    <label for="radioCriticRating">Critic rating</label>
+                    <label for="radioCriticRating">${OptionCriticRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated,SortName" data-mini="true">
-                    <label for="radioDateCreated">Date added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed,SortName" data-mini="true">
-                    <label for="radioDatePlayed">Date played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioMetascore" value="off" data-sortby="Metascore,SortName" data-mini="true">
                     <label for="radioMetascore">Metascore</label>
@@ -78,31 +79,31 @@
                     <label for="radioContentRating">Parental rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount,SortName" data-mini="true">
-                    <label for="radioPlayCount">Play count</label>
+                    <label for="radioPlayCount">${OptionPlayCount}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate,SortName" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRevenue" value="off" data-sortby="Revenue,SortName" data-mini="true">
-                    <label for="radioRevenue">Revenue</label>
+                    <label for="radioRevenue">${OptionRevenue}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime,SortName" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
-                    <label for="radioVideoBitRate">Video Bit rate</label>
+                    <label for="radioVideoBitRate">${OptionVideoBitrate}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -110,7 +111,7 @@
             <form>
 
                 <fieldset data-role="controlgroup" data-type="horizontal" style="margin-bottom: 1em;">
-                    <legend>Filters:</legend>
+                    <legend>${HeaderFilters}</legend>
                     <input type="radio" name="radioFilterTypes" id="radioBasicFilters" value="on" checked="checked" data-mini="true">
                     <label for="radioBasicFilters">Basic</label>
                     <input type="radio" name="radioFilterTypes" id="radioAdvancedFilters" value="off" data-mini="true">
@@ -122,22 +123,22 @@
                             <strong>User Data:</strong>
                         </legend>
                         <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                        <label for="chkPlayed">Watched</label>
+                        <label for="chkPlayed">${OptionPlayed}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                        <label for="chkUnplayed">Unwatched</label>
+                        <label for="chkUnplayed">${OptionUnplayed}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
-                        <label for="chkResumable">Resumable</label>
+                        <label for="chkResumable">${OptionResumable}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                        <label for="chkIsFavorite">Favorite</label>
+                        <label for="chkIsFavorite">${OptionFavorite}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                        <label for="chkLikes">Likes</label>
+                        <label for="chkLikes">${OptionLikes}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                        <label for="chkDislikes">Dislikes</label>
+                        <label for="chkDislikes">${OptionDislikes}</label>
                     </fieldset>
                     <fieldset data-role="controlgroup">
                         <legend>
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index 8575a0515..00e057f33 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -19,7 +19,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -30,16 +30,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index a6260e266..ad1b5d827 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -21,8 +21,8 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -34,49 +34,49 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </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="radioBudget" value="off" data-sortby="Budget" data-mini="true">
-                    <label for="radioBudget">Budget</label>
+                    <label for="radioBudget">${OptionBudget}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCriticRating" value="off" data-sortby="CriticRating" data-mini="true">
-                    <label for="radioCriticRating">Critic Rating</label>
+                    <label for="radioCriticRating">${OptionCriticRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
-                    <label for="radioPlayCount">Play Count</label>
+                    <label for="radioPlayCount">${OptionPlayCount}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
-                    <label for="radioRevenue">Revenue</label>
+                    <label for="radioRevenue">${OptionRevenue}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
                 </fieldset>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -84,25 +84,25 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Watched</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unwatched</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
-                    <label for="chkResumable">Resumable</label>
+                    <label for="chkResumable">${OptionResumable}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html
index 23cded823..675b8c2ef 100644
--- a/dashboard-ui/musicalbumartists.html
+++ b/dashboard-ui/musicalbumartists.html
@@ -7,12 +7,12 @@
     <div id="musicAlbumArtistsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html" class="ui-btn-active">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html" class="ui-btn-active">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
@@ -20,7 +20,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -31,16 +31,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html
index c69cb86e6..5c29aff53 100644
--- a/dashboard-ui/musicalbums.html
+++ b/dashboard-ui/musicalbums.html
@@ -7,12 +7,12 @@
     <div id="musicAlbumsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html" class="ui-btn-active">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html" class="ui-btn-active">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
         <div class="alphabetPicker">
         </div>
@@ -21,14 +21,14 @@
                 <div class="viewControls">
                     <div style="display: inline-block;">
                         <select data-mini="true" data-inline="true" id="selectView" name="selectView">
-                            <option value="Poster">Poster</option>
-                            <option value="Timeline">Timeline</option>
+                            <option value="Poster">${OptionPoster}</option>
+                            <option value="Timeline">${OptionTimeline}</option>
                         </select>
                     </div>
                 </div>
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -40,36 +40,36 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </legend>
 
                     <input class="radioSortBy" 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 defaultSort" type="radio" name="radioSortBy" id="radioAlbumArtist" value="off" data-sortby="AlbumArtist,SortName" data-mini="true">
-                    <label for="radioAlbumArtist">Album Artist</label>
+                    <label for="radioAlbumArtist">${OptionAlbumArtist}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SortName" data-mini="true">
-                    <label for="radioCommunityRating">Community Rating</label>
+                    <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="ProductionYear,PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -77,16 +77,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html
index 001f0010a..f6d2794fe 100644
--- a/dashboard-ui/musicartists.html
+++ b/dashboard-ui/musicartists.html
@@ -7,12 +7,12 @@
     <div id="musicArtistsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html" class="ui-btn-active">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="ui-btn-active">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
@@ -20,7 +20,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -31,16 +31,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html
index 260ecc58c..75e77fe92 100644
--- a/dashboard-ui/musicgenres.html
+++ b/dashboard-ui/musicgenres.html
@@ -7,37 +7,37 @@
     <div id="musicGenresPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html" class="ui-btn-active">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
             </div>
             <div id="items" class="itemsContainer"></div>
         </div>
-        <div data-role="panel" id="filterPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
+        <div data-role="panel" id="filterPanel" data-position="right" data-display="overlay" data-position-fixed="true">
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html
index 8f62094e5..1262ec79f 100644
--- a/dashboard-ui/musicrecommended.html
+++ b/dashboard-ui/musicrecommended.html
@@ -7,35 +7,35 @@
     <div id="musicRecommendedPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html" class="ui-btn-active">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <table class="ehsContent">
                 <tr>
                     <td>
-                        <h1 class="listHeader">Latest Albums</h1>
+                        <h1 class="listHeader">${HeaderLatestAlbums}</h1>
 
                         <div id="recentlyAddedAlbums">
                         </div>
-                        <h1 class="listHeader">Latest Songs</h1>
+                        <h1 class="listHeader">${HeaderLatestSongs}</h1>
 
                         <div id="recentlyAddedSongs">
                         </div>
 
                         <div id="recentlyPlayed" style="display: none;">
-                            <h1 class="listHeader">Recently Played</h1>
+                            <h1 class="listHeader">${HeaderRecentlyPlayed}</h1>
 
                             <div id="recentlyPlayedSongs">
                             </div>
                         </div>
 
                         <div id="topPlayed" style="display: none;">
-                            <h1 class="listHeader">Frequently Played</h1>
+                            <h1 class="listHeader">${HeaderFrequentlyPlayed}</h1>
 
                             <div id="topPlayedSongs">
                             </div>
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html
index 8f8d3577d..8317ffb26 100644
--- a/dashboard-ui/musicvideos.html
+++ b/dashboard-ui/musicvideos.html
@@ -8,12 +8,12 @@
 
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html" class="ui-btn-active">Music Videos</a>
+            <a href="musicvideos.html" class="ui-btn-active">${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
@@ -21,8 +21,8 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -34,53 +34,53 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </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="radioBudget" value="off" data-sortby="Budget" data-mini="true">
-                    <label for="radioBudget">Budget</label>
+                    <label for="radioBudget">${OptionBudget}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
-                    <label for="radioCommunityRating">Community rating</label>
+                    <label for="radioCommunityRating">${OptionCommunityRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCriticRating" value="off" data-sortby="CriticRating" data-mini="true">
-                    <label for="radioCriticRating">Critic rating</label>
+                    <label for="radioCriticRating">${OptionCriticRating}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
-                    <label for="radioDatePlayed">Date played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
-                    <label for="radioPlayCount">Play count</label>
+                    <label for="radioPlayCount">${OptionPlayCount}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
-                    <label for="radioRevenue">Revenue</label>
+                    <label for="radioRevenue">${OptionRevenue}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
-                    <label for="radioVideoBitRate">Video bit rate</label>
+                    <label for="radioVideoBitRate">${OptionVideoBitrate}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -88,25 +88,25 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Watched</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unwatched</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
-                    <label for="chkResumable">Resumable</label>
+                    <label for="chkResumable">${OptionResumable}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
                 <fieldset data-role="controlgroup">
                     <legend>
diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html
index e714dca37..9a085b18e 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">Now Playing</div>
+        <div class="parentName">${HeaderNowPlaying}</div>
         <div data-role="content">
 
             <div id="playlist" class="detailTableContainer">
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index b358ba486..556e39b0f 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Plugins</title>
+    <title>${PluginsTitle}</title>
 </head>
 <body>
     <div id="pluginCatalogPage" data-role="page" class="page type-interior pluginConfigurationPage">
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
-                    <a href="plugins.html" data-role="button">My Plugins</a>
-                    <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Catalog</a>
-                    <a href="pluginupdates.html" data-role="button">Updates</a>
+                    <a href="plugins.html" data-role="button">${TabMyPlugins}</a>
+                    <a href="plugincatalog.html" data-role="button" class="ui-btn-active">${TabCatalog}</a>
+                    <a href="pluginupdates.html" data-role="button">${TabUpdates}</a>
                 </div>
                 <p style="margin: 2em 0;">
                     Types: <a data-rel="popup" data-position-to="origin" href="#freePlugins">Free</a>, 
diff --git a/dashboard-ui/plugins.html b/dashboard-ui/plugins.html
index c2da1874f..6eaaef3c9 100644
--- a/dashboard-ui/plugins.html
+++ b/dashboard-ui/plugins.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Plugins</title>
+    <title>${PluginsTitle}</title>
 </head>
 <body>
     <div id="pluginsPage" data-role="page" class="page type-interior pluginConfigurationPage">
@@ -9,9 +9,9 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="plugins.html" data-role="button" class="ui-btn-active">My Plugins</a>
-                    <a href="plugincatalog.html" data-role="button">Catalog</a>
-                    <a href="pluginupdates.html" data-role="button">Updates</a>
+                    <a href="plugins.html" data-role="button" class="ui-btn-active">${TabMyPlugins}</a>
+                    <a href="plugincatalog.html" data-role="button">${TabCatalog}</a>
+                    <a href="pluginupdates.html" data-role="button">${TabUpdates}</a>
                 </div>
 
                 <div class="readOnlyContent">
diff --git a/dashboard-ui/pluginupdates.html b/dashboard-ui/pluginupdates.html
index a1a24195b..4be7c3554 100644
--- a/dashboard-ui/pluginupdates.html
+++ b/dashboard-ui/pluginupdates.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Plugins</title>
+    <title>${PluginsTitle}</title>
 </head>
 <body>
     <div id="pluginUpdatesPage" data-role="page" class="page type-interior pluginConfigurationPage">
@@ -9,9 +9,9 @@
         <div data-role="content">
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="plugins.html" data-role="button">My Plugins</a>
-                    <a href="plugincatalog.html" data-role="button">Catalog</a>
-                    <a href="pluginupdates.html" data-role="button" class="ui-btn-active">Updates</a>
+                    <a href="plugins.html" data-role="button">${TabMyPlugins}</a>
+                    <a href="plugincatalog.html" data-role="button">${TabCatalog}</a>
+                    <a href="pluginupdates.html" data-role="button" class="ui-btn-active">${TabUpdates}</a>
                 </div>
 
                 <form id="pluginUpdatesForm">
@@ -20,8 +20,8 @@
                         <thead>
                             <tr>
                                 <th></th>
-                                <th data-priority="2">Automatic updates</th>
-                                <th data-priority="3">Update level</th>
+                                <th data-priority="2">${HeaderAutomaticUpdates}</th>
+                                <th data-priority="3">${HeaderUpdateLevel}</th>
                             </tr>
                         </thead>
                         <tbody id="tbodyPluginUpdates"></tbody>
@@ -31,7 +31,7 @@
                     <br />
 
                     <div class="fieldDescription warningFieldDescription">
-                        Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all.                          
+                        ${DevBuildWarning}                         
                     </div>
 
                 </form>
diff --git a/dashboard-ui/scheduledtasks.html b/dashboard-ui/scheduledtasks.html
index f4c3896fa..410937f74 100644
--- a/dashboard-ui/scheduledtasks.html
+++ b/dashboard-ui/scheduledtasks.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Scheduled Tasks</title>
+    <title>${ScheduledTasksTitle}</title>
 </head>
 <body>
     <div id="scheduledTasksPage" data-role="page" class="page type-interior">
         <div data-role="content">
             <div class="content-primary">
                 <div class="readOnlyContent">
-                    <p>Click a task to adjust it's schedule.</p>
+                    <p>${ScheduledTasksHelp}</p>
                     <div id="divScheduledTasks"></div>
                 </div>
             </div>
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 1120de95d..f4f365885 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -244,6 +244,8 @@
         $('#chkEnableMpegtsM2TsMode', popup).checked(transcodingProfile.EnableMpegtsM2TsMode).checkboxradio('refresh');
         $('#chkEstimateContentLength', popup).checked(transcodingProfile.EstimateContentLength).checkboxradio('refresh');
         $('#chkReportByteRangeRequests', popup).checked(transcodingProfile.TranscodeSeekInfo == 'Bytes').checkboxradio('refresh');
+
+        $('.radioTabButton:first', popup).checked(true).checkboxradio('refresh').trigger('change');
     }
 
     function deleteTranscodingProfile(page, index) {
@@ -523,11 +525,12 @@
 
         var page = this;
 
-        $('.radioProfileTab', page).on('change', function () {
+        $('.radioTabButton', page).on('change', function () {
 
-            $('.profileTab', page).hide();
-            $('.' + this.value, page).show();
+            var elem = $('.' + this.value, page);
+            elem.siblings('.tabContent').hide();
 
+            elem.show();
         });
 
         $('#selectDirectPlayProfileType', page).on('change', function () {
@@ -595,7 +598,7 @@
 
         var page = this;
 
-        $('.radioSeriesTimerTab', page).checked(false).checkboxradio('refresh');
+        $('.radioTabButton', page).checked(false).checkboxradio('refresh');
         $('#radioInfo', page).checked(true).checkboxradio('refresh').trigger('change');
 
     });
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 0d57d8a2b..277202c04 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -666,6 +666,8 @@
 
             // Some 1080- videos are reported as 1912?
             if (maxAllowedWidth >= 1910) {
+                options.push({ name: '1080p - 30Mbps', maxWidth: 1920, bitrate: 30000000 });
+                options.push({ name: '1080p - 25Mbps', maxWidth: 1920, bitrate: 25000000 });
                 options.push({ name: '1080p - 20Mbps', maxWidth: 1920, bitrate: 20000000 });
                 options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
                 options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
@@ -728,7 +730,7 @@
 
             var baseParams = {
                 audioChannels: 2,
-                StartTimeTicks: startPosition || 0,
+                StartTimeTicks: startPosition,
                 SubtitleStreamIndex: getInitialSubtitleStreamIndex(mediaStreams, user),
                 AudioStreamIndex: getInitialAudioStreamIndex(mediaStreams, user),
                 deviceId: ApiClient.deviceId(),
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 7190c0cff..61b4667a5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -165,9 +165,13 @@
 
                 if (finalParams.isStatic) {
                     currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
-                    currentSrc = replaceQueryString(currentSrc, 'starttimeticks', '');
                 } else {
                     currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension);
+                }
+
+                if (finalParams.isStatic || !ticks) {
+                    currentSrc = replaceQueryString(currentSrc, 'starttimeticks', '');
+                } else {
                     currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks);
                 }
 
@@ -219,6 +223,14 @@
 
         self.canPlayVideoDirect = function (mediaSource, videoStream, audioStream, subtitleStream, maxWidth, bitrate) {
 
+            if (!mediaSource) {
+                throw new Error('Null mediaSource');
+            }
+
+            if (!videoStream) {
+                throw new Error('Null videoStream');
+            }
+
             if (mediaSource.VideoType != "VideoFile" || mediaSource.LocationType != "FileSystem") {
                 console.log('Transcoding because the content is not a video file');
                 return false;
@@ -252,13 +264,13 @@
                 return false;
             }
 
-            var extension = mediaSource.Path.substring(mediaSource.Path.lastIndexOf('.') + 1).toLowerCase();
+            var extension = (mediaSource.Container || '').toLowerCase();
 
             if (extension == 'm4v') {
                 return $.browser.chrome;
             }
 
-            return extension.toLowerCase() == 'mp4';
+            return extension == 'mp4';
         };
 
         self.getFinalVideoParams = function (mediaSource, maxWidth, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension) {
@@ -323,7 +335,7 @@
                 });
             }
             else if (firstItem.Type == "MusicArtist") {
-                
+
                 promise = self.getItemsForPlayback({
                     Artists: firstItem.Name,
                     Filters: "IsNotFolder",
@@ -334,7 +346,7 @@
 
             }
             else if (firstItem.Type == "MusicGenre") {
-                
+
                 promise = self.getItemsForPlayback({
                     Genres: firstItem.Name,
                     Filters: "IsNotFolder",
@@ -927,7 +939,7 @@
 
             self.bindVolumeSlider();
             self.bindPositionSlider();
-        };
+        }
 
         function replaceQueryString(url, param, value) {
             var re = new RegExp("([?|&])" + param + "=.*?(&|$)", "i");
@@ -935,12 +947,12 @@
                 return url.replace(re, '$1' + param + "=" + value + '$2');
             else
                 return url + '&' + param + "=" + value;
-        };
+        }
 
         function sendProgressUpdate(itemId, mediaSourceId) {
 
             ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, mediaSourceId, self.getCurrentTicks(), currentMediaElement.paused, currentMediaElement.volume == 0);
-        };
+        }
 
         function clearProgressInterval() {
 
@@ -953,7 +965,7 @@
         function canPlayWebm() {
 
             return testableVideoElement.canPlayType('video/webm').replace(/no/, '');
-        };
+        }
 
         function onPositionSliderChange() {
 
@@ -964,16 +976,7 @@
             var newPositionTicks = (newPercent / 100) * currentMediaSource.RunTimeTicks;
 
             self.changeStream(Math.floor(newPositionTicks));
-        };
-
-        function endsWith(text, pattern) {
-
-            text = text.toLowerCase();
-            pattern = pattern.toLowerCase();
-
-            var d = text.length - pattern.length;
-            return d >= 0 && text.lastIndexOf(pattern) === d;
-        };
+        }
 
         function playAudio(item, mediaSource, startPositionTicks) {
 
@@ -1009,12 +1012,13 @@
 
                 if (stream.Type == "Audio") {
 
+                    var container = (mediaSource.Container || '').toLowerCase();
                     // Stream statically when possible
-                    if (endsWith(mediaSource.Path, ".aac") && stream.BitRate <= 256000) {
+                    if (container == 'aac' && stream.BitRate <= 256000) {
                         aacUrl += "&static=true" + seekParam;
                         isStatic = true;
                     }
-                    else if (endsWith(mediaSource.Path, ".mp3") && stream.BitRate <= 256000) {
+                    else if (container == 'mp3' && stream.BitRate <= 256000) {
                         mp3Url += "&static=true" + seekParam;
                         isStatic = true;
                     }
@@ -1055,7 +1059,7 @@
             $('#subtitleButton', nowPlayingBar).hide();
             $('#chaptersButton', nowPlayingBar).hide();
 
-            $('#mediaElement', nowPlayingBar).html(html);
+            var mediaElement = $('#mediaElement', nowPlayingBar).html(html);
             var audioElement = $("audio", mediaElement);
 
             var initialVolume = localStorage.getItem("volume") || 0.5;
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index e670c38d5..5c786a952 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -39,6 +39,16 @@
                 });
                 $('.itemsContainer', page).removeClass('timelineItemsContainer');
             }
+            else if (view == "Banner") {
+
+                html = LibraryBrowser.getPosterViewHtml({
+                    items: result.Items,
+                    shape: "banner",
+                    preferBanner: true,
+                    context: 'movies'
+                });
+                $('.itemsContainer', page).removeClass('timelineItemsContainer');
+            }
             else if (view == "Poster") {
                 html = LibraryBrowser.getPosterViewHtml({
                     items: result.Items,
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 5927a44de..c4e8bdb02 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -50,10 +50,8 @@
         ApiClient.getNextUpEpisodes(options).done(function (result) {
 
             if (result.Items.length) {
-                $('#resumableSection', page).show();
                 $('.noNextUpItems', page).hide();
             } else {
-                $('#resumableSection', page).hide();
                 $('.noNextUpItems', page).show();
             }
 
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index c829cfca5..6f953e8bf 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -7,18 +7,18 @@
     <div id="songsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="music">
         <div class="libraryViewNav">
             <a href="musicrecommended.html">${TabSuggested}</a>
-            <a href="songs.html" class="ui-btn-active">Songs</a>
-            <a href="musicalbums.html">Albums</a>
-            <a href="musicalbumartists.html">Album Artists</a>
-            <a href="musicartists.html">Artists</a>
+            <a href="songs.html" class="ui-btn-active">${TabSongs}</a>
+            <a href="musicalbums.html">${TabAlbums}</a>
+            <a href="musicalbumartists.html">${TabAlbumArtists}</a>
+            <a href="musicartists.html">${TabArtists}</a>
             <a href="musicgenres.html">${TabGenres}</a>
-            <a href="musicvideos.html">Music Videos</a>
+            <a href="musicvideos.html">${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -30,47 +30,47 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </legend>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioName" value="on" checked="checked" data-sortby="Name" data-mini="true">
-                    <label for="radioName">Track Name</label>
+                    <label for="radioName">${OptionTrackName}</label>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioAlbum" value="on" checked="checked" data-sortby="Album,SortName" data-mini="true">
-                    <label for="radioAlbum">Album</label>
+                    <label for="radioAlbum">${OptionAlbum}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioAlbumArtist" value="on" data-sortby="AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioAlbumArtist">Album Artist</label>
+                    <label for="radioAlbumArtist">${OptionAlbumArtist}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioArtist" value="on" data-sortby="Artist,Album,SortName" data-mini="true">
-                    <label for="radioArtist">Artist</label>
+                    <label for="radioArtist">${OptionArtist}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated,AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed,AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioDatePlayed">Date Played</label>
+                    <label for="radioDatePlayed">${OptionDatePlayed}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount,AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioPlayCount">Play Count</label>
+                    <label for="radioPlayCount">${OptionPlayCount}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate,AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioPremiereDate">Release Date</label>
+                    <label for="radioPremiereDate">${OptionReleaseDate}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime,AlbumArtist,Album,SortName" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
@@ -78,22 +78,22 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
-                    <label for="chkPlayed">Played</label>
+                    <label for="chkPlayed">${OptionPlayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
-                    <label for="chkUnplayed">Unplayed</label>
+                    <label for="chkUnplayed">${OptionUnplayed}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index 8e0cf7a01..a8ac73ede 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -18,7 +18,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -29,16 +29,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index c658b3287..c5d90a43e 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -17,7 +17,7 @@
         </div>
         <div data-role="content">
             <div class="ehsContent">
-                <h1 class="listHeader">Latest Episodes</h1>
+                <h1 class="listHeader">${HeaderLatestEpisodes}</h1>
                 <div id="latestEpisodes">
                 </div>
             </div>
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index 8e778dd8c..761d62316 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -21,7 +21,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -32,32 +32,32 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Person Types:</strong>
+                        <strong>${HeaderPersonTypes}</strong>
                     </legend>
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkActor" id="chkActor" data-filter="Actor" data-mini="true">
-                    <label for="chkActor">Actors</label>
+                    <label for="chkActor">${OptionActors}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkGuestStars" id="chkGuestStars" data-filter="GuestStar" data-mini="true">
-                    <label for="chkGuestStars">Guest Stars</label>
+                    <label for="chkGuestStars">${OptionGuestStars}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkDirectors" id="chkDirectors" data-filter="Director" data-mini="true">
-                    <label for="chkDirectors">Directors</label>
+                    <label for="chkDirectors">${OptionDirectors}</label>
 
                     <input class="chkPersonTypeFilter" type="checkbox" name="chkWriters" id="chkWriters" data-filter="Writer" data-mini="true">
-                    <label for="chkWriters">Writers</label>
+                    <label for="chkWriters">${OptionWriters}</label>
                 </fieldset>
             </form>
         </div>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 077e54a18..78de4941d 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -21,17 +21,17 @@
                     <td>
 
                         <div id="resumableSection" style="display: none;">
-                            <h1 class="listHeader">Resume</h1>
+                            <h1 class="listHeader">${HeaderResume}</h1>
 
                             <div id="resumableItems">
                             </div>
                         </div>
 
-                        <h1 class="listHeader">Next Up</h1>
+                        <h1 class="listHeader">${HeaderNextUp}</h1>
 
                         <div id="nextUpItems">
                         </div>
-                        <p class="noNextUpItems" style="display: none;">None found. Start watching your shows!</p>
+                        <p class="noNextUpItems" style="display: none;">${NoNextUpItemsMessage}</p>
                     </td>
                 </tr>
             </table>
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 0af6e00a4..c613e0704 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -30,8 +30,8 @@
                     </div>
                 </div>
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="sort" data-inline="true" data-iconpos="notext" title="Sort" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
+                    <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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -43,7 +43,7 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort By:</strong>
+                        <strong>${HeaderSortBy}</strong>
                     </legend>
 
                     <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
@@ -53,7 +53,7 @@
                     <label for="radioCommunityRating">IMDb Rating</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
-                    <label for="radioDateCreated">Date Added</label>
+                    <label for="radioDateCreated">${OptionDateAdded}</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioContentRating" value="off" data-sortby="OfficialRating" data-mini="true">
                     <label for="radioContentRating">Parental Rating</label>
@@ -62,26 +62,26 @@
                     <label for="radioPremiereDate">Premiere Date</label>
 
                     <input class="radioSortBy" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
-                    <label for="radioRuntime">Runtime</label>
+                    <label for="radioRuntime">${OptionRuntime}</label>
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Sort Order:</strong>
+                        <strong>${HeaderSortOrder}</strong>
                     </legend>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                    <label for="radioAscending">Ascending</label>
+                    <label for="radioAscending">${OptionAscending}</label>
 
                     <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                    <label for="radioDescending">Descending</label>
+                    <label for="radioDescending">${OptionDescending}</label>
                 </fieldset>
             </form>
         </div>
         <div data-role="panel" id="filterPanel" data-position="right" data-display="overlay" data-position-fixed="true">
             <form>
                 <fieldset data-role="controlgroup" data-type="horizontal" style="margin-bottom: 1em;">
-                    <legend>Filters:</legend>
+                    <legend>${HeaderFilters}</legend>
                     <input type="radio" name="radioFilterTypes" id="radioBasicFilters" value="on" checked="checked" data-mini="true">
                     <label for="radioBasicFilters">Basic</label>
                     <input type="radio" name="radioFilterTypes" id="radioAdvancedFilters" value="off" data-mini="true">
@@ -91,16 +91,16 @@
                 <div class="basicFilters">
                     <fieldset data-role="controlgroup">
                         <legend>
-                            <strong>Filters:</strong>
+                            <strong>${HeaderFilters}</strong>
                         </legend>
                         <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                        <label for="chkIsFavorite">Favorite</label>
+                        <label for="chkIsFavorite">${OptionFavorite}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                        <label for="chkLikes">Likes</label>
+                        <label for="chkLikes">${OptionLikes}</label>
 
                         <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                        <label for="chkDislikes">Dislikes</label>
+                        <label for="chkDislikes">${OptionDislikes}</label>
                     </fieldset>
 
                     <fieldset data-role="controlgroup">
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 5578f7942..814bd9eeb 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -18,7 +18,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls" data-role="controlgroup" data-type="horizontal">
-                    <button data-mini="true" data-icon="filter" data-inline="true" data-iconpos="notext" title="Filter" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</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>
                 </div>
                 <div class="listTopPaging">
                 </div>
@@ -29,16 +29,16 @@
             <form>
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Filters:</strong>
+                        <strong>${HeaderFilters}</strong>
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
-                    <label for="chkIsFavorite">Favorite</label>
+                    <label for="chkIsFavorite">${OptionFavorite}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
-                    <label for="chkLikes">Likes</label>
+                    <label for="chkLikes">${OptionLikes}</label>
 
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
-                    <label for="chkDislikes">Dislikes</label>
+                    <label for="chkDislikes">${OptionDislikes}</label>
                 </fieldset>
             </form>
         </div>