diff --git a/css/main.css b/css/main.css
index 6f1f314..15df0cf 100644
--- a/css/main.css
+++ b/css/main.css
@@ -31,7 +31,6 @@ a {
     display: inline-block;
     position: relative;
     padding-left: 4rem;
-    min-width: 70%;
 }
 
 .file-list .file-name::before {
@@ -59,14 +58,42 @@ a {
     background-image: url(../image/other.png);
 }
 
+.file-list .parent .file-name::before {
+    background-image: url(../image/parent.png);
+}
+
 .file-list .file-link {
 
 }
 
 .file-list .file-date {
+    padding: .25rem .5rem;
+    background: #1EAEDB;
+    border-radius: .5rem;
+    font-size: 70%;
+    margin: 0 .5rem;
+    color: #fff;
+}
 
+.file-list .directory .file-date {
+}
+
+.file-list .parent .file-date {
+    display: none;
 }
 
 .file-list .file-size {
-
+    padding: .25rem .5rem;
+    background: #24db53;
+    border-radius: .5rem;
+    font-size: 70%;
+    margin: 0 .5rem;
+    color: #fff;
 }
+
+.file-list .other .file-size,
+.file-list .parent .file-size,
+.file-list .directory .file-size {
+    display: none;
+}
+
diff --git a/image/parent.png b/image/parent.png
new file mode 100644
index 0000000..6e8e2d7
Binary files /dev/null and b/image/parent.png differ
diff --git a/js/main.js b/js/main.js
index 4fad066..a24bfeb 100644
--- a/js/main.js
+++ b/js/main.js
@@ -22,19 +22,17 @@ $(document).ready(function () {
             fileItemElement.find(".file-date").text(moment(fileDate).fromNow());
         }
 
-        if (fileType === "directory") {
-            if (fileName === "..") {
-                // navigate to parent dir
-                fileItemElement.find(".file-link").click(function () {
-                    navigateTo(directory);
-                });
+        if (fileType === "parent") {
+            // navigate to parent dir
+            fileItemElement.find(".file-link").click(function () {
+                navigateTo(directory);
+            });
 
-            } else {
-                // navigate to sub dir
-                fileItemElement.find(".file-link").click(function () {
-                    navigateTo(directory + fileName + "/");
-                });
-            }
+        } else if (fileType === "directory") {
+            // navigate to sub dir
+            fileItemElement.find(".file-link").click(function () {
+                navigateTo(directory + fileName + "/");
+            });
 
         } else if (fileType === "other") {
             // nginx returns symlinks as type other,
@@ -95,7 +93,7 @@ $(document).ready(function () {
             fileListElement.append(renderFileElement(
                 parentDir,
                 "..",
-                "directory"
+                "parent"
             ));
         }
 
@@ -119,7 +117,10 @@ $(document).ready(function () {
             success: function (filesData) {
 
                 filesData.map(function (fileData) {
-                    return fileData.mtime = new Date(fileData.mtime);
+                    fileData.mtime = new Date(fileData.mtime);
+                    fileData.size = fileData.size ? fileSize(fileData.size) : null;
+
+                    return fileData;
                 });
 
                 renderFileList(filesData, path);
@@ -146,6 +147,28 @@ $(document).ready(function () {
         });
     }
 
+    function sizeOf(bytes) {
+        if (bytes == 0) {
+            return "0.00 B";
+        }
+        var e = Math.floor(Math.log(bytes) / Math.log(1024));
+        return (bytes / Math.pow(1024, e)).toFixed(2) + ' ' + ' KMGTP'.charAt(e) + 'B';
+    }
+
+    function fileSize(bytes) {
+        var exp = Math.log(bytes) / Math.log(1024) | 0;
+        var value = bytes / Math.pow(1024, exp);
+
+        if (exp == 0) {
+            return value.toFixed(0) + ' bytes';
+
+        } else {
+            var result = value.toFixed(2);
+            return result + ' ' + 'KMGTPEZY'[exp - 1] + 'B';
+        }
+
+    }
+
     var isNavigating = false;
 
     function navigateToUrlLocation() {
@@ -156,7 +179,7 @@ $(document).ready(function () {
 
     if (history.replaceState) {
         window.onpopstate = function () {
-            if(!isNavigating) {
+            if (!isNavigating) {
                 navigateToUrlLocation();
             }
         };