diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index ace11163f3..405ab4f9d4 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -48,6 +48,10 @@
                             <div class="fieldDescription">${LabelTheseFeaturesRequireSupporterHelpAndTrailers}</div>
                             <div class="fieldDescription"><a href="supporter.html">${ButtonLearnMore}</a></div>
                         </li>
+                        <li>
+                            <label for="txtNumTrailers">${LabelNumberTrailerToPlay}</label>
+                            <input type="number" id="txtNumTrailers" data-mini="true" min="1" max="10" step="1" />
+                        </li>
                         <li>
                             <label for="chkEnableParentalControl">${LabelEnableIntroParentalControl}</label>
                             <input type="checkbox" id="chkEnableParentalControl" data-mini="true" />
diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index 3c972cb618..6e470c85a9 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -133,6 +133,10 @@
     display: none!important;
 }
 
+.idlePlayer video {
+    cursor: none;
+}
+
 #mediaPlayer .sliderContainer {
     position: relative;
     top: 5px;
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index d8762ddc42..30e71a1668 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -43,13 +43,19 @@
                             <br />
                             <ul data-role="listview" class="ulForm">
                                 <li>
-                                    <label for="txtPortNumber">${LabelHttpServerPortNumber}</label>
+                                    <label for="txtPortNumber">${LabelLocalHttpServerPortNumber}</label>
                                     <input type="number" id="txtPortNumber" name="txtPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" />
+                                    <div class="fieldDescription">${LabelLocalHttpServerPortNumberHelp}</div>
                                 </li>
                                 <li>
-                                    <label for="chkEnableUpnp">${LabelEnableAutomaticPortMapping}</label>
+                                    <label for="txtPublicPort">${LabelPublicPort}</label>
+                                    <input type="number" id="txtPublicPort" pattern="[0-9]*" required="required" min="1" data-mini="true" />
+                                    <div class="fieldDescription">${LabelPublicPortHelp}</div>
+                                </li>
+                                <li>
+                                    <label for="chkEnableUpnp">${LabelEnableAutomaticPortMap}</label>
                                     <input type="checkbox" id="chkEnableUpnp" data-mini="true" />
-                                    <div class="fieldDescription">${LabelEnableAutomaticPortHelp}</div>
+                                    <div class="fieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
                                 </li>
                                 <li>
                                     <label for="txtDdns">${LabelExternalDDNS}</label>
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index 2af38ac29e..56ca68eea3 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -32,6 +32,14 @@
                             <label for="chkSaveMetadataHidden">${OptionSaveMetadataAsHidden}</label>
                             <input type="checkbox" id="chkSaveMetadataHidden" data-mini="true" />
                         </li>
+                        <li>
+                            <label for="selectDateAdded">${LabelDateAddedBehavior}</label>
+                            <select data-mini="true" id="selectDateAdded">
+                                <option value="0">${OptionDateAddedImportTime}</option>
+                                <option value="1">${OptionDateAddedFileTime}</option>
+                            </select>
+                            <div class="fieldDescription">${LabelDateAddedBehaviorHelp}</div>
+                        </li>
                     </ul>
 
                     <div data-role="collapsible">
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 1e1987041c..6b356c816c 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -15,6 +15,7 @@
         $('#chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl).checkboxradio('refresh');
 
         $('#txtCustomIntrosPath', page).val(config.CustomIntroPath || '');
+        $('#txtNumTrailers', page).val(config.TrailerLimit);
 
         Dashboard.hideLoadingMsg();
     }
@@ -69,6 +70,7 @@
             ApiClient.getNamedConfiguration("cinemamode").done(function (config) {
 
                 config.CustomIntroPath = $('#txtCustomIntrosPath', page).val();
+                config.TrailerLimit = $('#txtNumTrailers', page).val();
 
                 config.EnableIntrosForMovies = $('#chkMovies', page).checked();
                 config.EnableIntrosForEpisodes = $('#chkEpisodes', page).checked();
diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js
index 35bc112a6d..b92dc78284 100644
--- a/dashboard-ui/scripts/dashboardgeneral.js
+++ b/dashboard-ui/scripts/dashboardgeneral.js
@@ -13,6 +13,7 @@
         })).val(config.UICulture).selectmenu('refresh');
 
         $('#txtPortNumber', page).val(config.HttpServerPortNumber);
+        $('#txtPublicPort', page).val(config.PublicPort);
 
         $('#txtDdns', page).val(config.WanDdns || '');
 
@@ -81,6 +82,8 @@
                 config.UICulture = $('#selectLocalizationLanguage', form).val();
 
                 config.HttpServerPortNumber = $('#txtPortNumber', form).val();
+                config.PublicPort = $('#txtPublicPort', form).val();
+
                 config.EnableUPnP = $('#chkEnableUpnp', form).checked();
 
                 config.WanDdns = $('#txtDdns', form).val();
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index e585a88fa1..8352b8561a 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -60,7 +60,7 @@
 
         self.resetEnhancements = function () {
             $("#mediaPlayer").hide();
-            $('#videoPlayer').removeClass('fullscreenVideo');
+            $('#videoPlayer').removeClass('fullscreenVideo').removeClass('idlePlayer');
             $('.hiddenOnIdle').removeClass("inactive");
             $("video").remove();
         };
@@ -497,6 +497,7 @@
 
             if (idleState == true) {
                 $('.hiddenOnIdle').removeClass("inactive");
+                $('#videoPlayer').removeClass('idlePlayer');
             }
 
             idleState = false;
@@ -504,6 +505,7 @@
             timeout = window.setTimeout(function () {
                 idleState = true;
                 $('.hiddenOnIdle').addClass("inactive");
+                $('#videoPlayer').addClass('idlePlayer');
             }, 4000);
         }
 
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index ae949dd4be..5386564e28 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -22,6 +22,13 @@
         Dashboard.hideLoadingMsg();
     }
 
+    function loadMetadataConfig(page, config) {
+
+
+        $('#selectDateAdded', page).val((config.UseFileCreationTimeForDateAdded ? '1' : '0')).selectmenu("refresh");
+
+    }
+
     function loadChapters(page, config, providers) {
 
         if (providers.length) {
@@ -167,6 +174,12 @@
 
         });
 
+        ApiClient.getNamedConfiguration("metadata").done(function (metadata) {
+
+            loadMetadataConfig(page, metadata);
+
+        });
+
         var promise1 = ApiClient.getNamedConfiguration("chapters");
         var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters"));
 
@@ -200,6 +213,16 @@
         });
     }
 
+    function saveMetadata(form) {
+        
+        ApiClient.getNamedConfiguration("metadata").done(function (config) {
+
+            config.UseFileCreationTimeForDateAdded = $('#selectDateAdded', form).val() == '1';
+
+            ApiClient.updateNamedConfiguration("metadata", config);
+        });
+    }
+
     function saveChapters(form) {
 
         ApiClient.getNamedConfiguration("chapters").done(function (config) {
@@ -237,6 +260,7 @@
 
             saveAdvancedConfig(form);
             saveChapters(form);
+            saveMetadata(form);
 
             // Disable default form submission
             return false;