diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index f314d2d892..4e11c0e628 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -90,8 +90,6 @@
                             <button type="submit" data-role="none" class="clearButton">
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
-
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                         </li>
 
                     </ul>
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 645601295f..d1541aad04 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -170,8 +170,6 @@
                             <button type="submit" data-role="none" class="clearButton">
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
-
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                         </li>
 
                     </ul>
diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html
index 13432fadb9..858e39f29f 100644
--- a/dashboard-ui/channelsettings.html
+++ b/dashboard-ui/channelsettings.html
@@ -34,8 +34,6 @@
                             <button type="submit" data-role="none" class="clearButton">
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
-
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                         </li>
                     </ul>
                 </form>
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 66bf2541c8..7a6c9bba80 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -80,8 +80,6 @@
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
 
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
-
                         </li>
 
                     </ul>
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index 1640bd6854..d6b39c0f36 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -7,7 +7,7 @@
         </div>
     </div>
     <div>
-        <paper-input type="text" id="txtValue" required="required" label="${LabelName}"></paper-input>
+        <paper-input type="text" id="txtValue" required="required" label="${LabelDisplayName}"></paper-input>
     </div>
     <div>
         <paper-input type="text" id="txtPath" required="required" label="${LabelFolder}" style="display: inline-block;width:84%;"></paper-input>
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 28f50492de..47db5547f4 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -72,8 +72,6 @@
                             <button type="submit" data-role="none" class="clearButton">
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
-
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                         </li>
 
                     </ul>
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index b54806d13f..37cd8a6704 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -57,8 +57,6 @@
                             <button type="submit" data-role="none" class="clearButton">
                                 <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                             </button>
-
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                         </li>
 
                     </ul>
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index eb429b7df1..d32df18f8c 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -40,8 +40,6 @@
                                 <button type="submit" data-role="none" class="clearButton">
                                     <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                                 </button>
-
-                                <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                             </li>
                         </ul>
 
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index fb782f9f0e..42fe87da41 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -47,8 +47,6 @@
                                 <button type="submit" data-role="none" class="clearButton">
                                     <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
                                 </button>
-
-                                <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
                             </li>
                         </ul>
 
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index b73c5c8a2d..519db49acc 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -14,13 +14,13 @@
                     <a href="librarysettings.html" data-role="button">${TabAdvanced}</a>
                 </div>
 
-                <div style="text-align: right;">
+                <div id="divVirtualFolders"></div>
+                <br />
+                <div>
 
                     <paper-button raised class="btnRefresh"><iron-icon icon="refresh"></iron-icon><span>${ButtonScanLibrary}</span></paper-button>
                     <progress max="100" min="0" style="display: inline-block; vertical-align: middle;" class="refreshProgress"></progress>
                 </div>
-                <div id="divVirtualFolders"></div>
-
             </div>
         </div>
     </div>
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 2f9c958b70..48156e7b07 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -107,6 +107,12 @@
             ironIcon: 'folder'
         });
 
+        menuItems.push({
+            name: Globalize.translate('ButtonEdit'),
+            id: 'edit',
+            ironIcon: 'mode-edit'
+        });
+
         menuItems.push({
             name: Globalize.translate('ButtonRemove'),
             id: 'delete',
@@ -131,6 +137,9 @@
                         case 'changetype':
                             changeCollectionType(page, virtualFolder);
                             break;
+                        case 'edit':
+                            editVirtualFolder(page, virtualFolder);
+                            break;
                         case 'rename':
                             renameVirtualFolder(page, virtualFolder);
                             break;
diff --git a/dashboard-ui/strings/html/en-US.json b/dashboard-ui/strings/html/en-US.json
index 6b7344175c..5ae122bcce 100644
--- a/dashboard-ui/strings/html/en-US.json
+++ b/dashboard-ui/strings/html/en-US.json
@@ -1524,5 +1524,6 @@
     "ButtonEditImages": "Edit Images",
     "LabelFolder": "Folder:",
     "LabelAdditionalFoldersCanBeAddedHelp": "Additional folders can be added to this library after setting it up.",
-    "HeadersFolders": "Folders"
+    "HeadersFolders": "Folders",
+    "LabelDisplayName": "Display name:"
 }
\ No newline at end of file
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 9cc8909df0..1aaa552893 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1540,5 +1540,6 @@
     "ButtonEditImages": "Edit Images",
     "LabelFolder": "Folder:",
     "LabelAdditionalFoldersCanBeAddedHelp": "Additional folders can be added to this library after setting it up.",
-    "HeadersFolders": "Folders"
+    "HeadersFolders": "Folders",
+    "LabelDisplayName": "Display name:"
 }