diff --git a/assets/public/js/application.js b/assets/public/js/application.js
index df8e4181..6f631e5a 100644
--- a/assets/public/js/application.js
+++ b/assets/public/js/application.js
@@ -9,45 +9,49 @@ Array.prototype.removeElement = function(element) {
     }
 }
 
+Document.prototype.sendCostumEvent = function(text) {
+    document.dispatchEvent(new CustomEvent(text));
+}
+
 var viewEvent = function(event) {
-  var cookie = getCookie("view-list");
-  var listing = document.getElementById("listing");
+    let cookie = getCookie('view-list');
+    let listing = document.getElementById('listing');
 
-  if (cookie != "true") {
-    document.cookie = "view-list=true";
-  } else {
-    document.cookie = "view-list=false";
-  }
+    if (cookie != 'true') {
+        document.cookie = 'view-list=true';
+    } else {
+        document.cookie = 'view-list=false';
+    }
 
-  handleViewType(getCookie("view-list"));
-  return false;
+    handleViewType(getCookie('view-list'));
+    return false;
 }
 
 var handleViewType = function(viewList) {
-  var listing = document.getElementById("listing");
-  var button = document.getElementById("view");
+    let listing = document.getElementById('listing');
+    let button = document.getElementById('view');
 
-  if (viewList == "true") {
-    listing.classList.add("list");
-    button.innerHTML = "<i class=\"material-icons\">view_module</i>";
+    if (viewList == "true") {
+        listing.classList.add('list');
+        button.innerHTML = '<i class="material-icons">view_module</i>';
+        return false;
+    }
+
+    button.innerHTML = '<i class="material-icons">view_list</i>';
+    listing.classList.remove('list');
     return false;
-  }
-
-  button.innerHTML = "<i class=\"material-icons\">view_list</i>";
-  listing.classList.remove("list");
-  return false;
 }
 
 var getCookie = function(name) {
-  var re = new RegExp("(?:(?:^|.*;\\s*)" + name + "\\s*\\=\\s*([^;]*).*$)|^.*$");
-  return document.cookie.replace(re, "$1");
+    var re = new RegExp("(?:(?:^|.*;\\s*)" + name + "\\s*\\=\\s*([^;]*).*$)|^.*$");
+    return document.cookie.replace(re, "$1");
 }
 
 var changeToLoading = function(element) {
     var originalText = element.innerHTML;
     element.style.opacity = 0;
     setTimeout(function() {
-        element.innerHTML = "<i class=\"material-icons spin\">autorenew</i>";
+        element.innerHTML = '<i class="material-icons spin">autorenew</i>';
         element.style.opacity = 1;
     }, 200);
 
@@ -56,29 +60,34 @@ var changeToLoading = function(element) {
 
 var changeToDone = function(element, error, html) {
     element.style.opacity = 0;
-    setTimeout(function() {
+
+    let thirdStep = () => {
+        element.innerHTML = html;
+        element.style.opacity = 1;
+
+        if (selectedItems.length == 0) {
+            document.sendCostumEvent('changed-selected');
+        }
+    }
+
+    let secondStep = () => {
+        element.style.opacity = 0;
+        setTimeout(thirdStep, 200);
+    }
+
+    let firstStep = () => {
         if (error) {
-            element.innerHTML = "<i class=\"material-icons\">close</i>";
+            element.innerHTML = '<i class="material-icons">close</i>';
         } else {
-            element.innerHTML = "<i class=\"material-icons\">done</i>";
+            element.innerHTML = '<i class="material-icons">done</i>';
         }
 
         element.style.opacity = 1;
 
-        setTimeout(function() {
-            element.style.opacity = 0;
+        setTimeout(secondStep, 1000);
+    }
 
-            setTimeout(function() {
-                element.innerHTML = html;
-                element.style.opacity = 1;
-
-                if (selectedItems.length == 0) {
-                    var event = new CustomEvent('changed-selected');
-                    document.dispatchEvent(event);
-                }
-            }, 200);
-        }, 1000);
-    }, 200);
+    setTimeout(firstStep, 200);
     return false;
 }
 
@@ -105,41 +114,107 @@ var backEvent = function(event) {
 }
 
 var deleteEvent = function(event) {
-  if (selectedItems.length) {
-    Array.from(selectedItems).forEach(item => {
-        var html = changeToLoading(document.getElementById("delete"));
-        var request = new XMLHttpRequest();
-        request.open("DELETE", item);
-        request.send();
-        request.onreadystatechange = function() {
-            if (request.readyState == 4) {
-                if (request.status == 200) {
-                    document.getElementById(item).remove();
-                    selectedItems.removeElement(item);
-                }
+    if (selectedItems.length) {
+        Array.from(selectedItems).forEach(item => {
+            let html = changeToLoading(document.getElementById("delete"));
+            let request = new XMLHttpRequest();
+            request.open("DELETE", item);
+            request.send();
+            request.onreadystatechange = function() {
+                if (request.readyState == 4) {
+                    if (request.status == 200) {
+                        document.getElementById(item).remove();
+                        console.log(selectedItems);
+                        selectedItems.removeElement(item);
+                    }
 
-                changeToDone(document.getElementById("delete"), (request.status != 200), html);
+                    changeToDone(document.getElementById("delete"), (request.status != 200), html);
+                }
             }
+        });
+
+        return false;
+    }
+
+    let request = new XMLHttpRequest();
+    request.open("DELETE", window.location);
+    request.send();
+    request.onreadystatechange = function() {
+        if (request.readyState == 4) {
+            if (request.status == 200) {
+                window.location.pathname = RemoveLastDirectoryPartOf(window.location.pathname);
+            }
+
+            changeToDone(document.getElementById("delete"), (request.status != 200), html);
         }
-    });
+    }
 
     return false;
-  }
+}
 
-  var request = new XMLHttpRequest();
-  request.open("DELETE", window.location);
-  request.send();
-  request.onreadystatechange = function() {
-      if (request.readyState == 4) {
-          if (request.status == 200) {
-            window.location.pathname = RemoveLastDirectoryPartOf(window.location.pathname);
-          }
+var preventDefault = function(event) {
+    event.preventDefault();
+}
 
-          changeToDone(document.getElementById("delete"), (request.status != 200), html);
-      }
-  }
+var renameEvent = function(event) {
+    if (selectedItems.length) {
+        Array.from(selectedItems).forEach(link => {
+            let item = document.getElementById(link);
+            let span = item.getElementsByTagName('span')[0];
+            let name = span.innerHTML;
 
-  return false;
+            item.addEventListener('click', preventDefault);
+            item.removeEventListener('click', itemClickEvent);
+            span.setAttribute('contenteditable', 'true');
+            span.focus();
+
+            let keyDownEvent = (event) => {
+                if (event.keyCode == 13) {
+                    let newName = span.innerHTML;
+                    let html = changeToLoading(document.getElementById('rename'));
+                    let request = new XMLHttpRequest();
+                    request.open('PATCH', link);
+                    request.setRequestHeader('Rename-To', newName);
+                    request.send();
+                    request.onreadystatechange = function() {
+                        if (request.readyState == 4) {
+                            if (request.status != 200) {
+                                span.innerHTML = name;
+                            } else {
+                                span.innerHTML = newName;
+                            }
+
+                            changeToDone(document.getElementById('rename'), (request.status != 200), html);
+                        }
+                    }
+                }
+
+                if (event.KeyCode == 27) {
+                    span.innerHTML = name;
+                }
+
+                if (event.keyCode == 13 || event.keyCode == 27) {
+                    span.setAttribute('contenteditable', 'false');
+                    span.removeEventListener('keydown', keyDownEvent);
+                    item.removeEventListener('click', preventDefault);
+                    item.addEventListener('click', itemClickEvent);
+                    event.preventDefault();
+                }
+            }
+
+            span.addEventListener('keydown', keyDownEvent);
+            span.addEventListener('blur', (event) => {
+                span.innerHTML = name;
+                span.setAttribute('contenteditable', 'false');
+                span.removeEventListener('keydown', keyDownEvent);
+                item.removeEventListener('click', preventDefault);
+            });
+        });
+
+        return false;
+    }
+
+    return false;
 }
 
 var downloadEvent = function(event) {
@@ -157,7 +232,7 @@ var downloadEvent = function(event) {
 var RemoveLastDirectoryPartOf = function(url) {
     var arr = url.split('/');
     arr.pop();
-    return( arr.join('/') );
+    return (arr.join('/'));
 }
 
 document.addEventListener("changed-selected", function(event) {
@@ -186,25 +261,27 @@ document.addEventListener("changed-selected", function(event) {
     return false;
 });
 
+var itemClickEvent = function(event) {
+  var url = this.getElementsByTagName('a')[0].getAttribute('href');
+
+  if (selectedItems.length != 0) event.preventDefault();
+  if (selectedItems.indexOf(url) == -1) {
+      this.classList.add('selected');
+      selectedItems.push(url);
+  } else {
+      this.classList.remove('selected');
+      selectedItems.removeElement(url);
+  }
+
+  var event = new CustomEvent('changed-selected');
+  document.dispatchEvent(event);
+  return false;
+}
+
 document.addEventListener("DOMContentLoaded", function(event) {
     var items = document.getElementsByClassName('item');
     Array.from(items).forEach(link => {
-        link.addEventListener('click', function(event) {
-            var url = link.getElementsByTagName('a')[0].getAttribute('href');
-            
-            if (selectedItems.length != 0) event.preventDefault();
-            if (selectedItems.indexOf(url) == -1) {
-                link.classList.add('selected');
-                selectedItems.push(url);
-            } else {
-                link.classList.remove('selected');
-                selectedItems.removeElement(url);
-            }
-
-            var event = new CustomEvent('changed-selected');
-            document.dispatchEvent(event);
-            return false;
-        });
+        link.addEventListener('click', itemClickEvent);
     });
 
     document.getElementById("open").addEventListener("click", openEvent);
@@ -216,6 +293,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
         document.getElementById("view").addEventListener("click", viewEvent)
     };
     document.getElementById("delete").addEventListener("click", deleteEvent);
+    document.getElementById("rename").addEventListener("click", renameEvent);
     document.getElementById("download").addEventListener("click", downloadEvent);
 
     /* var drop = document.getElementById("listing");
diff --git a/fileinfo.go b/fileinfo.go
index fa2b4219..220331eb 100644
--- a/fileinfo.go
+++ b/fileinfo.go
@@ -135,8 +135,7 @@ func (fi FileInfo) Rename(w http.ResponseWriter, r *http.Request) (int, error) {
 		return ErrorToHTTPCode(err), err
 	}
 
-	http.Redirect(w, r, strings.Replace(r.URL.Path, fi.Name, newname, 1), http.StatusTemporaryRedirect)
-	return 0, nil
+	return http.StatusOK, nil
 }
 
 // ServeAsHTML is used to serve single file pages