diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
index 4d1e7e44cc..8483779b3b 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
@@ -61,10 +61,13 @@
     padding: 2px 0 2px 20px;
 }
 
-.upload-panel .queued li span.label {
+.upload-panel .queued li .label {
     display: inline-block;
-    width: 150px;
-    overflow: hidden;
+    width: 145px;
+    margin: 0 5px 0 0;
+    border: solid 1px #e0e0e0;
+    height: 1.5em;
+    vertical-align: middle;
 }
 
 .upload-panel .queued li span.progress {
@@ -73,6 +76,7 @@
     border: solid 1px #e0e0e0;
     overflow: hidden;
     height: 1.5em;
+    vertical-align: middle;
 }
 
 .upload-panel .queued li span.progress span {
@@ -84,6 +88,7 @@
 
 .upload-panel .queued li img {
     margin-left: 5px;
+    vertical-align: middle;
 }
 
 .umbFolderBrowser .breadcrumb {
diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
index eda2ae45ea..cb380ba028 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
@@ -37,7 +37,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
         {
             var self = this;
             
-            $.getJSON(self._opts.basePath + "/FolderBrowserService/GetChildNodes/" + self._parentId + "/" + self._viewModel.filterTerm(), function (data) {
+            $.getJSON(self._opts.basePath + "/FolderBrowserService/GetChildren/" + self._parentId + "/" + self._viewModel.filterTerm(), function (data) {
                 if (data != undefined && data.length > 0) {
                     ko.mapping.fromJS(data, itemMappingOptions, self._viewModel.items);
                 } else {
@@ -77,59 +77,30 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
             window.open(item.FileUrl(), "Download");
         },
         
-        _deleteItem: function (id)
+        _deleteItems: function (ids)
         {
             var self = this;
 
-            var item = self._getItemById(id);
-            if (item === null)
-                throw Error("No item found with the id: " + id);
+            var msg = ids.length + " item" + ((ids.length > 1) ? "s" : "");
 
-            if (confirm(window.top.uiKeys['defaultdialogs_confirmdelete'] + ' "' + item.Name() + '"?\n\n'))
+            if (confirm(window.top.uiKeys['defaultdialogs_confirmdelete'] + ' the selected ' + msg + '?\n\n'))
             {
                 $(window.top).trigger("nodeDeleting", []);
 
-                var safePath = "," + item.Path() + ",";
+                $.getJSON(self._opts.basePath + "/FolderBrowserService/Delete/" + ids.join(), function (data) {
+                    if (data != undefined && data.success) {
+                        //raise nodeDeleted event
+                        $(window.top).trigger("nodeDeleted", []);
 
-                if (safePath.indexOf(",-20,") != -1 || safePath.indexOf(",-21,") != -1)
-                {
-                    window.top.umbraco.presentation.webservices.legacyAjaxCalls.DeleteContentPermanently(
-                        item.Id(),
-                        "media",
-                        function () {
-                            //raise nodeDeleted event
-                            $(window.top).trigger("nodeDeleted", []);
+                        //TODO: Reload current open node in tree
 
-                            //TODO: Reload current open node in tree
-
-                            // Reload nodes
-                            self._getChildNodes();
-                        });
-                }
-                else
-                {
-                    window.top.umbraco.presentation.webservices.legacyAjaxCalls.Delete(
-                        item.Id(), "",
-                        "media",
-                        function() {
-                            //raise nodeDeleted event
-                            $(window.top).trigger("nodeDeleted", []);
-
-                            //TODO: Reload current open node in tree
-
-                            // Reload nodes
-                            self._getChildNodes();
-                        },
-                        function(error) {
-                            //raise public error event
-                            $(window.top).trigger("publicError", [error]);
-
-                            //TODO: Reload current open node in tree
-
-                            // Reload nodes
-                            self._getChildNodes();
-                        });
-                }
+                        // Reload nodes
+                        self._getChildNodes();
+                        
+                    } else {
+                        throw Error("There was an error deleting the selected nodes: " + ids.join());
+                    }
+                });
             }
         },
         
@@ -145,6 +116,20 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                 queued: ko.observableArray([])
             });
 
+            self._viewModel.selected = ko.computed(function() {
+                return ko.utils.arrayFilter(this.items(), function(item) {
+                    return item.selected();
+                });
+            }, self._viewModel);
+            
+            self._viewModel.selectedIds = ko.computed(function() {
+                var ids = [];
+                ko.utils.arrayForEach(this.selected(), function(item) {
+                    ids.push(item.Id());
+                });
+                return ids;
+            }, self._viewModel);
+
             self._viewModel.filterTerm.subscribe(function (newValue) {
                 self._getChildNodes();
             });
@@ -179,10 +164,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                 instructions +
                 "<form action=\"/base/FolderBrowserService/Upload/" + this._parentId + "\" method=\"post\" enctype=\"multipart/form-data\">" +
                 "<input id='fileupload' type='file' name='file' multiple>" +
+                "<input type='hidden' name='name' />" +
                 "<input type='hidden' name='overwriteExisting' />" +
                 "</form>" +
                 "<ul class='queued' data-bind='foreach: queued'><li>" +
-                "<span class='label' data-bind='text: name'></span>" +
+                "<input type='text' class='label' data-bind=\"value: name, valueUpdate: 'afterkeydown', enable: progress() == 0\" />" +
                 "<span class='progress'><span data-bind=\"style: { width: progress() + '%' }\"></span></span>" +
                 "<a href='' data-bind='click: cancel'><img src='images/delete.png' /></a>" +
                 "</li></ul>" +
@@ -204,7 +190,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                     var file = {
                         uploaderId: data.uploaderId,
                         itemId: data.itemId,
-                        name: data.name,
+                        name: ko.observable(data.name),
                         size: data.size,
                         progress: ko.observable(data.progress),
                         cancel: function () {
@@ -215,6 +201,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                         }
                     };
 
+                    file.name.subscribe(function (newValue) {
+                        $("#fu-item-" + file.uploaderId + "-" + file.itemId + " input[name=name]").val(newValue);
+                    });
+
                     // Store item back in context for easy access later
                     data.context = file;
 
@@ -287,7 +277,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                             self._downloadItem(id);
                             break;
                         case "delete":
-                            self._deleteItem(id);
+                            self._deleteItems(self._viewModel.selectedIds());
                             break;
                     }
                 },
@@ -318,6 +308,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                     //var oldIndex = self._viewModel.items.indexOf(self._viewModel.tempItem());
                     var newIndex = ui.item.index();
 
+                    //TODO: Don't allow sorting on a filtered view
+
                     $(".umbFolderBrowser .items .selected").sort(function (a,b) {
                         return parseInt($(a).data("order")) > parseInt($(b).data("order")) ? 1 : -1;
                     }).each(function(idx, itm) {
diff --git a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
index adb9c284b3..272d83c8bb 100644
--- a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
+++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
@@ -114,7 +114,7 @@ namespace Umbraco.Web.UI.Controls
 
             // Create thumbnails container
             sb.Append("<ul class='items' data-bind='foreach: items'>" +
-                      "<li data-bind=\"attr: { 'data-id': Id, 'data-order': $index() }, css: { selected: selected() }, event: { mousedown: toggleSelected }\"><div><span class='img'><img data-bind='attr: { src: ThumbnailUrl }' /></span><span data-bind='text: Name'></span></div></li>" +
+                      "<li data-bind=\"attr: { 'data-id': Id, 'data-order': $index() }, css: { selected: selected() }, event: { mousedown: toggleSelected, contextmenu: toggleSelected }\"><div><span class='img'><img data-bind='attr: { src: ThumbnailUrl }' /></span><span data-bind='text: Name'></span></div></li>" +
                       "</ul>");
 
             panel.Controls.Add(new LiteralControl(sb.ToString()));
diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs
index 34878eb09b..ed281a7894 100644
--- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs
+++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.WebServices
     public class FolderBrowserService
     {
         [RestExtensionMethod(returnXml = false)]
-        public static string GetChildNodes(int parentId, string filterTerm)
+        public static string GetChildren(int parentId, string filterTerm)
         {
             var parentMedia = new global::umbraco.cms.businesslogic.media.Media(parentId);
             var currentUser = User.GetCurrent();
@@ -63,6 +63,27 @@ namespace Umbraco.Web.WebServices
             return new JavaScriptSerializer().Serialize(data);
         }
 
+        [RestExtensionMethod(returnXml = false)]
+        public static string Delete(string nodeIds)
+        {
+            var nodeIdParts = nodeIds.Split(',');
+
+            foreach (var nodeIdPart in nodeIdParts.Where(x => !string.IsNullOrEmpty(x)))
+            {
+                var nodeId = 0;
+                if (!Int32.TryParse(nodeIdPart, out nodeId)) 
+                    continue;
+                
+                var node = new global::umbraco.cms.businesslogic.media.Media(nodeId);
+                node.delete(("," + node.Path + ",").Contains(",-21,"));
+            }
+
+            return new JavaScriptSerializer().Serialize(new
+            {
+                success = true
+            });
+        }
+
         [RestExtensionMethod(returnXml = false)]
         public static string Upload(int parentId)
         {