diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html
index e4bbefdfa0..092ac77c42 100644
--- a/dashboard-ui/advancedserversettings.html
+++ b/dashboard-ui/advancedserversettings.html
@@ -25,16 +25,16 @@
                             <label for="txtWebSocketPortNumber">Web socket port number: </label>
                             <input type="number" id="txtWebSocketPortNumber" name="txtWebSocketPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" />
                         </li>
-                        <li>
-                            <label for="txtDdns">External DDNS:</label>
-                            <input id="txtDdns" data-mini="true" />
-                            <div class="fieldDescription">If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.</div>
-                        </li>
                         <li>
                             <label for="chkEnableUpnp">Enable UPnP</label>
                             <input type="checkbox" id="chkEnableUpnp" data-mini="true" />
                             <div class="fieldDescription">UPnP allows automated router configuration for remote access. This may not work with some router models.</div>
                         </li>
+                        <li>
+                            <label for="txtDdns">External DDNS:</label>
+                            <input id="txtDdns" data-mini="true" />
+                            <div class="fieldDescription">If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.</div>
+                        </li>
                     </ul>
                     <ul data-role="listview" class="ulForm">
                         <li>
diff --git a/dashboard-ui/boxsets.html b/dashboard-ui/boxsets.html
index 063a90af8b..bf940b5c5a 100644
--- a/dashboard-ui/boxsets.html
+++ b/dashboard-ui/boxsets.html
@@ -21,6 +21,7 @@
         <div data-role="content">
             <div class="viewSettings">
                 <div class="viewControls">
+                    <button data-mini="true" data-icon="plus" data-inline="true" onclick="$('#newCollectionPanel', $(this).parents('.page')).panel( 'toggle' );">New</button>
                     <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="filter" data-inline="true" onclick="$('#filterPanel', $(this).parents('.page')).panel( 'toggle' );">Filter</button>
                 </div>
@@ -30,13 +31,34 @@
             </div>
             <div id="items" class="itemsContainer"></div>
         </div>
+        <div data-role="panel" id="newCollectionPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
+            <form class="newCollectionForm">
+
+                <h3>New Collection</h3>
+
+                <br />
+                <div>
+                    <label for="txtNewCollectionName">Name:</label>
+                    <input type="text" id="txtNewCollectionName" required="required" />
+                </div>
+
+                <div>
+                    <label for="chkEnableInternetMetadata">Search the internet for artwork and metadata</label>
+                    <input type="checkbox" id="chkEnableInternetMetadata" data-mini="true" />
+                </div>
+                <br />
+                <p>
+                    <button type="submit" data-icon="plus" data-mini="true" data-theme="b">Create</button>
+                </p>
+            </form>
+        </div>
+
         <div data-role="panel" id="sortPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
 
             <form>
                 <div id="sortpanel">
                     <fieldset data-role="controlgroup">
-                        <legend>
-                            <h3>Sort By:</h3>
+                        <legend>Sort By:
                         </legend>
 
                         <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
@@ -50,8 +72,7 @@
                     </fieldset>
 
                     <fieldset data-role="controlgroup">
-                        <legend>
-                            <h3>Sort Order:</h3>
+                        <legend>Sort Order:
                         </legend>
 
                         <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
@@ -66,8 +87,7 @@
         <div data-role="panel" id="filterPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
             <form>
                 <fieldset data-role="controlgroup">
-                    <legend>
-                        <h3>Filters:</h3>
+                    <legend>Filters:
                     </legend>
                     <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
                     <label for="chkIsFavorite">Favorite</label>
@@ -80,8 +100,7 @@
                 </fieldset>
 
                 <fieldset data-role="controlgroup">
-                    <legend>
-                        <strong>Features:</strong>
+                    <legend>Features:
                     </legend>
 
                     <input class="chkFeatureFilter" type="checkbox" name="chkTrailer" id="chkTrailer" data-mini="true">
@@ -97,6 +116,10 @@
 
             </form>
         </div>
+
+        <script type="text/javascript">
+            $('.newCollectionForm').off('submit', BoxSetsPage.onNewCollectionSubmit).on('submit', BoxSetsPage.onNewCollectionSubmit);
+        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 719dc79eab..f7d03b2d02 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -23,11 +23,12 @@
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <input type="checkbox" id="chkEnableInternetProviders" name="chkEnableInternetProviders" data-mini="true" />
-                            <label for="chkEnableInternetProviders">Download metadata and images from the internet </label>
+                            <label for="chkEnableInternetProviders">Download artwork and metadata from the internet </label>
+                            <div class="fieldDescription">Media Browser can download information about your media to enable rich presentations.</div>
                         </li>
                         <li>
                             <input type="checkbox" id="chkSaveLocal" name="chkSaveLocal" data-mini="true" />
-                            <label for="chkSaveLocal">Save metadata and images within media folders </label>
+                            <label for="chkSaveLocal">Save artwork and metadata within media folders </label>
                             <div class="fieldDescription">Save downloaded metadata and images into media folders where they can be stored permanently and easily edited.</div>
                         </li>
                         <li>
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 7d4209b514..50d3eb0399 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -183,4 +183,13 @@
         updateFilterControls(this);
     });
 
+    window.BoxSetsPage = {        
+        
+        onNewCollectionSubmit: function() {
+
+            Dashboard.alert('Coming soon');
+            return false;
+        }
+    };
+
 })(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 014a87bdaa..1e39302e90 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -6,58 +6,29 @@
 
         var query = {
 
-            SortBy: "PremiereDate,AirTime,SortName",
-            SortOrder: "Ascending",
-            IncludeItemTypes: "Episode",
-            Limit: 30,
-            Recursive: true,
-            Fields: "SeriesInfo,UserData"
+            Limit: 32,
+            Fields: "SeriesInfo,UserData",
+            UserId: Dashboard.getCurrentUserId()
         };
 
-        var missedItemsQuery = $.extend({
+        $.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).done(function (result) {
 
-            IsUnaired: false
+            var items = result.Items;
 
-        }, query);
-        
-        var yesterday = new Date();
-
-        yesterday.setDate(yesterday.getDate() - 1);
-        yesterday.setHours(0, 0, 0, 0);
-        
-        missedItemsQuery.MinPremiereDate = yesterday.toISOString();
-
-        var unairedQuery = $.extend({
-
-            IsUnaired: true
-
-        }, query);
-
-        var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), missedItemsQuery);
-        var promise2 = ApiClient.getItems(Dashboard.getCurrentUserId(), unairedQuery);
-
-        $.when(promise1, promise2).done(function (response1, response2) {
-
-            var missedItems = response1[0].Items;
-            var unairedItems = response2[0].Items;
-
-            for (var i = 0, length = unairedItems.length; i < length; i++) {
-                missedItems.push(unairedItems[i]);
-            }
-
-            if (!missedItems.length) {
+            if (!items.length) {
                 $('#upcomingItems', page).html("<p>Nothing here. Please ensure <a href='metadata.html'>downloading of internet metadata</a> is enabled.</p>").trigger('create');
                 return;
             }
 
             $('#upcomingItems', page).html(LibraryBrowser.getPosterViewHtml({
-                items: missedItems,
+                items: items,
                 showLocationTypeIndicator: false,
                 shape: "backdrop",
                 showTitle: true,
                 showPremiereDate: true,
                 showPremiereDateIndex: true,
                 preferThumb: true
+
             })).createPosterItemHoverMenu();
         });
     });
diff --git a/dashboard-ui/scripts/wizardimagesettings.js b/dashboard-ui/scripts/wizardimagesettings.js
index b9a8713b4c..1e35e97670 100644
--- a/dashboard-ui/scripts/wizardimagesettings.js
+++ b/dashboard-ui/scripts/wizardimagesettings.js
@@ -14,9 +14,10 @@
             // After saving chapter task, now save server config
             ApiClient.getServerConfiguration().done(function (config) {
 
-                config.ImageSavingConvention = $('#selectImageSavingConvention', page).val();
                 config.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked();
 
+                config.EnableUPnP = $('#chkEnableUpnp', page).checked();
+
                 ApiClient.updateServerConfiguration(config).done(function (result) {
 
                     navigateToNextPage();
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index 40cee8c238..3ba11a3b88 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -11,6 +11,8 @@
             config.MetadataCountryCode = $('#selectCountry', page).val();
             config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked();
 
+            config.EnableInternetProviders = $('#chkEnableInternetProviders', page).checked();
+
             ApiClient.updateServerConfiguration(config).done(function (result) {
 
                 navigateToNextPage();
diff --git a/dashboard-ui/wizardimagesettings.html b/dashboard-ui/wizardimagesettings.html
index e63b7ee746..bb7f84647b 100644
--- a/dashboard-ui/wizardimagesettings.html
+++ b/dashboard-ui/wizardimagesettings.html
@@ -13,16 +13,7 @@
                     <img src="css/images/mblogoicon.png" />Configure settings</h2>
 
                 <br />
-                <div style="margin: 1em 0;">
-                    <label for="selectImageSavingConvention"><b>Image saving convention:</b></label>
-                    <select name="selectImageSavingConvention" id="selectImageSavingConvention">
-                        <option value="Compatible" selected="selected">Compatible - MB3/Plex/Xbmc</option>
-                        <option value="Legacy">Standard - MB3/MB2</option>
-                    </select>
-                    <div class="fieldDescription">Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.</div>
-                </div>
-
-                <div style="margin: 2em 0;">
+                <div style="margin: 1em 0 2em;">
                     <label for="chkVideoImages">Enable video image extraction</label>
                     <input id="chkVideoImages" name="chkVideoImages" type="checkbox" checked="checked" />
                     <div class="fieldDescription">For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.</div>
@@ -34,6 +25,12 @@
                     <div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.</div>
                 </div>
 
+                <div style="margin: 2em 0;">
+                    <label for="chkEnableUpnp">Enable automatic port mapping</label>
+                    <input type="checkbox" id="chkEnableUpnp" checked="checked" />
+                    <div class="fieldDescription">UPnP allows automated router configuration for easy remote access. This may not work with some router models.</div>
+                </div>
+
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>
                     <button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true">Next</button>
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index 028211c0f9..e17d128fe3 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -15,7 +15,12 @@
 
                     <br />
                     <div style="margin: 1em 0;">
-                        <label for="chkSaveLocalMetadata">Save metadata into media folders</label>
+                        <input type="checkbox" id="chkEnableInternetProviders" name="chkEnableInternetProviders" checked="checked" />
+                        <label for="chkEnableInternetProviders">Download artwork and metadata from the internet </label>
+                        <div class="fieldDescription">Media Browser can download information about your media to enable rich presentations.</div>
+                    </div>
+                    <div style="margin: 2em 0;">
+                        <label for="chkSaveLocalMetadata">Save artwork and metadata into media folders</label>
                         <input id="chkSaveLocalMetadata" name="chkSaveLocalMetadata" type="checkbox" checked="checked" />
                         <div class="fieldDescription">Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.</div>
                     </div>