diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 8f380eec6d..d9f74ad2a8 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -99,7 +99,8 @@
 }
 
 .libraryPage > .ui-content {
-    padding: 10px 0 100px;
+    padding-top: 10px;
+    padding-bottom: 100px;
 }
 
 .libraryPage .currentUsername {
@@ -533,12 +534,19 @@ a.itemTag:hover {
 .libraryPanelCollapsibleHeader a {
     font-size: 16px;
     font-weight: 300!important;
+    font-family: 'Open Sans', Arial, Helvetica, sans-serif;
 }
 
-.selectedLibraryPanelLink a {
+.selectedLibraryPanelLink {
     background: #38c!important;
 }
 
+.libraryPanelLink {
+    font-size: 14px;
+    font-weight: 300!important;
+    font-family: 'Open Sans', Arial, Helvetica, sans-serif;
+}
+
 .desktopHomeLink img {
     height: 24px;
     vertical-align: middle;
diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css
index 776a68eab9..861e01deb7 100644
--- a/dashboard-ui/css/search.css
+++ b/dashboard-ui/css/search.css
@@ -52,13 +52,13 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    font-size: 12px;
+    font-size: 13px;
     color: #fff;
     font-weight: normal !important;
 }
 
 .searchHintSecondaryText {
-    font-size: 12px;
+    font-size: 13px;
     color: #bbb;
     margin-top: 3px;
     white-space: nowrap;
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 149b1c6ceb..26cf340b98 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -115,7 +115,7 @@ pre, textarea.pre {
     Header
     */
 .header {
-    padding: 10px 0 0 15px;
+    padding: 7px 0 0 15px;
 }
 
 .imgLogoIcon {
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 40702ba665..9686d43588 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -10,12 +10,13 @@
             <table class="ehsContent">
                 <tr>
                     <td>
-                        
-                        <br /><br />
+
+                        <br />
+                        <br />
                         <div id="views">
                         </div>
-                        <br /><br />
-                        <h1 class="listHeader"><a href="itemlist.html">Media Collections<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
+                        <br />
+                        <h1 class="listHeader"><a href="itemlist.html">Media Folders<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
 
                         <div id="divCollections"></div>
 
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index eb46fe7507..b614876a16 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -24,7 +24,7 @@
                     <p style="margin: 2em 0;">Refer to the <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a> for suggested folder structures.</p>
                     <div id="divMediaLibrary">
                         <p>
-                            <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
+                            <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
                         </p>
                         <div id="divVirtualFolders"></div>
                     </div>
@@ -45,7 +45,7 @@
                     </p>
 
                     <p id="fldCollectionType">
-                        <label for="selectCollectionType">Collection type:</label>
+                        <label for="selectCollectionType">Folder type:</label>
                         <select id="selectCollectionType" name="selectCollectionType"></select>
                     </p>
 
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 6f9aa19d3e..5aa46e61a6 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -16,10 +16,6 @@
             <form class="liveTvSeriesTimerForm" style="margin: 0 auto;">
                 <p><span class="itemName inlineItemName"></span></p>
 
-                <p>
-                    <a id="btnCancelTimer" href="#">Cancel Series</a>
-                </p>
-
                 <p class="channel" style="margin-top: 2em;"></p>
                 <p class="time"></p>
                 <p class="overview"></p>
@@ -94,17 +90,17 @@
                     </div>
                 </div>
                 <br />
-                <br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button type="submit" data-theme="b" data-icon="check" data-mini="true">
-                            Save
-                        </button>
-                        <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
-                            Cancel
-                        </button>
-                    </li>
-                </ul>
+                <div>
+                    <button type="submit" data-theme="a" data-icon="check" data-mini="true">
+                        Save
+                    </button>
+                    <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                        Cancel
+                    </button>
+                </div>
+                <p style="border-top: 1px solid #444; padding-top: .5em; margin-top: 2em;">
+                    <button id="btnCancelTimer" type="button" data-mini="true" data-icon="delete">Cancel Series</button>
+                </p>
             </form>
         </div>
         <script type="text/javascript">
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html
index 9095c09a9d..69c66bf770 100644
--- a/dashboard-ui/livetvseriestimers.html
+++ b/dashboard-ui/livetvseriestimers.html
@@ -14,7 +14,6 @@
         </div>
         <div data-role="content">
             <div style="max-width: 700px; margin: 0 auto;">
-                <br />
                 <div id="items"></div>
             </div>
         </div>
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index f0e2d441ee..494c0d47f6 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -31,7 +31,7 @@
             </div>
         </div>
 
-        <div data-role="popup" id="popupLogin" class="popup">
+        <div data-role="popup" id="popupLogin" class="popup" data-dismissible="false">
             <form class="loginForm">
                 <div class="ui-bar-a" style="text-align: center;">
                     <h3>Please sign in</h3>
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index ee997a4ce9..4e0f68263b 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -5,7 +5,7 @@
         var tips = [
             'Did you know that editing the artist or album of a music video will allow it to appear on the artist and album pages?',
             'Did you know that editing the tmdb id, tvdb id, and/or games db id of an album will allow media browser to link it to a movie, series or game as a soundtrack?',
-            'Did you know that you can re-order your media collections by editing their sort names?',
+            'Did you know that you can re-order your media folders by editing their sort names?',
             'Did you know that series, seasons, games and boxsets can have local trailers?',
             'Did you know that movies can have special features by placing them in a "specials" sub-folder underneath the movie folder?',
             'Did you know that the trailer plugin can automatically download trailers for existing movies in your collection?'
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index c601b9fc24..3bc60ca013 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -222,11 +222,10 @@
             var link = links[i];
             
             if (selectedIndex == i) {
-                html += '<li class="selectedLibraryPanelLink">';
+                html += '<li><a class="selectedLibraryPanelLink libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
             } else {
-                html += '<li>';
+                html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
             }
-            html += '<a href="' + link.href + '">' + link.text + '</a></li>';
         }
 
         html += '</ul>';
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index 93973c3969..cf985a4e3a 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -4,7 +4,7 @@
 
         var html = '';
 
-        html += '<a class="squareTileItem tileItem" href="livetvchannel.html?id=' + channel.Id + '">';
+        html += '<a class="backdropTileItem tileItem" href="livetvchannel.html?id=' + channel.Id + '">';
 
         var imgUrl;
         var isDefault;
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index e7d878deea..7c569d6d69 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -23,46 +23,21 @@
 
         var html = '';
 
-        var cssClass = "detailTable";
+        html += '<ul data-role="listview" data-inset="true">';
 
-        html += '<div class="detailTableContainer"><table class="' + cssClass + '">';
-
-        html += '<tr>';
-
-        html += '<th class="tabletColumn">&nbsp;</th>';
-        html += '<th>Name</th>';
-        html += '<th class="desktopColumn">Channel</th>';
-        html += '<th>Days</th>';
-        html += '<th>Time</th>';
-
-        html += '</tr>';
+        html += '<li data-role="list-divider">Series Recordings</li>';
 
         for (var i = 0, length = timers.length; i < length; i++) {
 
             var timer = timers[i];
 
-            html += '<tr>';
+            html += '<li><a href="livetvseriestimer.html?id=' + timer.Id + '">';
 
-            html += '<td class="tabletColumn">';
-            html += '<button data-timerid="' + timer.Id + '" class="btnDeleteTimer" type="button" data-icon="delete" data-inline="true" data-mini="true" data-iconpos="notext">Delete</button>';
-            html += '</td>';
-
-            html += '<td>';
-            html += '<a href="livetvseriestimer.html?id=' + timer.Id + '">' + timer.Name + '</a>';
-            html += '</td>';
-
-            html += '<td class="desktopColumn">';
-            
-            if (timer.RecordAnyChannel) {
-                html += 'All Channels';
-            }
-            else if (timer.ChannelId) {
-                html += '<a href="livetvchannel.html?id=' + timer.ChannelId + '">' + timer.ChannelName + '</a>';
-            }
-            html += '</td>';
-
-            html += '<td>';
+            html += '<h3>';
+            html += timer.Name;
+            html += '</h3>';
 
+            html += '<p>';
             if (timer.DayPattern) {
                 html += timer.DayPattern;
             }
@@ -71,24 +46,30 @@
 
                 html += days.join(', ');
             }
+            
+            if (timer.RecordAnyTime) {
 
-            html += '</td>';
+                html += ' - Any time.';
+            } else {
+                html += ' - ' + LiveTvHelpers.getDisplayTime(timer.StartDate);
+            }
+            html += '</p>';
 
-            html += '<td>' + LiveTvHelpers.getDisplayTime(timer.StartDate) + '</td>';
+            html += '<p>';
+            if (timer.RecordAnyChannel) {
+                html += 'All Channels';
+            }
+            else if (timer.ChannelId) {
+                html += timer.ChannelName;
+            }
+            html += '</p>';
 
-            html += '</tr>';
+            html += '</li>';
         }
 
-        html += '</table></div>';
+        html += '</a></ul>';
 
-        var elem = $('#items', page).html(html).trigger('create');
-
-        $('.btnDeleteTimer', elem).on('click', function () {
-
-            var id = this.getAttribute('data-timerid');
-
-            deleteTimer(page, id);
-        });
+        $('#items', page).html(html).trigger('create');
 
         Dashboard.hideLoadingMsg();
     }
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 4324be0123..0b4dcc0beb 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -117,8 +117,8 @@
     changeCollectionType: function () {
 
         Dashboard.alert({
-            message: "To change the collection type, please remove and rebuild the collection with the new type.",
-            title: "Change Collection Type"
+            message: "To change the folder type, please remove and rebuild the collection with the new type.",
+            title: "Change Folder Type"
         });
     },
 
@@ -137,7 +137,7 @@
 
         typeName = typeName ? typeName.name : "General or mixed content";
 
-        html += '<p style="padding-left:.5em;">Collection type: <b>' + typeName + '</b></p>';
+        html += '<p style="padding-left:.5em;">Folder type: <b>' + typeName + '</b></p>';
 
         html += '<ul class="mediaFolderLocations" data-inset="true" data-role="listview" data-split-icon="minus">';
 
@@ -189,7 +189,7 @@
 
         $('.collectionTypeFieldDescription').show();
 
-        MediaLibraryPage.getTextValue("Add Media Collection", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
+        MediaLibraryPage.getTextValue("Add Media Folder", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
 
             var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
 
diff --git a/dashboard-ui/tvnextup.html b/dashboard-ui/tvnextup.html
index 18710b93e1..cb63fc5c8d 100644
--- a/dashboard-ui/tvnextup.html
+++ b/dashboard-ui/tvnextup.html
@@ -17,7 +17,7 @@
         </div>
         <div data-role="content">
             <div class="ehsContent">
-                <h1 class="listHeader">Next Episodes</h1>
+                <br />
                 <div id="nextUpItems">
                 </div>
             </div>
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index 1253f1eeaf..056ea117ac 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -18,7 +18,7 @@
                 </p>
                 <div id="divMediaLibrary">
                     <p>
-                        <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
+                        <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
                     </p>
                     <div id="divVirtualFolders"></div>
                 </div>
@@ -38,7 +38,7 @@
                             </p>
 
                             <p id="fldCollectionType">
-                                <label for="selectCollectionType">Collection type:</label>
+                                <label for="selectCollectionType">Folder type:</label>
                                 <select id="selectCollectionType" name="selectCollectionType"></select>
                             </p>