diff --git a/src/filemanager.html b/src/filemanager.html
index 8aecb0d2d..ba317e857 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -129,22 +129,28 @@
   <div class="main-container animateMe ng-hide " ng-show="initialized">
     <br/>
     <div class="row">
-      <div class="col-md-6 col-md-offset-3">
-        <div class="card">
-          <h3>FileManager for {{ app.fqdn }}</h3>
-
-          <br/>
-          <br/>
+      <div class="col-md-12">
+        <div class="card card-large">
 
           <input type="file" id="uploadFileInput" style="display: none" multiple/>
           <input type="file" id="uploadFolderInput" style="display: none" multiple webkitdirectory directory/>
 
+          <h4 class="text-center">{{ app.fqdn }}</h4>
+
           <div>
-            <button class="btn btn-primary" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
-            <span>Path: <b>{{ cwd }}</b></span>
-            <button class="btn btn-primary pull-right" ng-click="newDirectory.show()">New Directory</button>
-            <button class="btn btn-primary pull-right" ng-click="onUploadFile()">Upload File</button>
-            <button class="btn btn-primary pull-right" ng-click="onUploadFolder()">Upload Folder</button>
+            <div class="btn-group" role="group">
+              <button class="btn btn-primary" ng-click="goDirectoryUp()" ng-disabled="cwd === '/'"><i class="fas fa-arrow-left"></i></button>
+              <button class="btn btn-primary" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
+            </div>
+            <div class="btn-group" role="group">
+              <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')"><i class="fas fa-home"></i> / </button>
+              <button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
+            </div>
+            <div class="btn-group pull-right" role="group">
+              <button class="btn btn-primary" ng-click="newDirectory.show()">New Folder</button>
+              <button class="btn btn-primary" ng-click="onUploadFile()">Upload File</button>
+              <button class="btn btn-primary" ng-click="onUploadFolder()">Upload Folder</button>
+            </div>
           </div>
 
           <br/>
@@ -160,20 +166,13 @@
               </tr>
             </thead>
             <tbody>
-              <tr ng-hide="cwd === '/'">
-                <td><i class="fas fa-level-up-alt"></i></td>
-                <td class="hand elide-table-cell" ng-click="goDirectoryUp()">Up</td>
-                <td class="text-right no-wrap" style="vertical-align: bottom"></td>
-                <td class="text-right no-wrap" style="vertical-align: bottom"></td>
-                <td class="text-right no-wrap" style="vertical-align: bottom"></td>
-              </tr>
               <tr ng-repeat="entry in entries">
-                <td>
+                <td ng-click="open(entry)" class="hand">
                   <i class="fas fa-folder" ng-show="entry.isDirectory"></i>
                   <i class="far fa-file" ng-show="entry.isFile"></i>
                 </td>
                 <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.fileName }}</td>
-              <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyDiskSize }}</td>
+                <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyDiskSize }}</td>
                 <td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
                   <button class="btn btn-xs btn-default" ng-click="renameEntry.show(entry)"><i class="far fa-edit"></i></button>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 5cee86561..520b2ec09 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -22,6 +22,7 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
     $scope.initialized = false;
     $scope.client = Client;
     $scope.cwd = '/';
+    $scope.cwdParts = [];
     $scope.appId = search.appId;
     $scope.app = null;
     $scope.entries = [];
@@ -73,12 +74,17 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
         setDirectory($scope.cwd + '/..');
     };
 
+    $scope.changeDirectory = function (path) {
+        setDirectory(path);
+    };
+
     function setDirectory(path) {
         path = sanitize(path);
 
         if ($scope.cwd === path) return;
 
         $scope.cwd = path;
+        $scope.cwdParts = path.split('/').filter(function (p) { return !!p; }).map(function (p, i) { return { name: p, path: path.split('/').slice(0, i+2).join('/') }; });
         $scope.refresh();
     }