diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js
index 1153897..aac96cb 100644
--- a/js/controllers/website-controller.js
+++ b/js/controllers/website-controller.js
@@ -472,6 +472,7 @@ app.controller('websiteCtrl', [
   }
 
   vm.showUploadButton = true;
+  vm.showFolderAction = true;
   vm.createNewFolder = function (r) {
     if (vm.savedPath === undefined) {
       vm.savedPath = '/';
@@ -496,9 +497,17 @@ app.controller('websiteCtrl', [
     vm.directoryPath = path;
     vm.getSiteContents(path, site);
     vm.showUploadButton = false;
+    vm.showFolderAction = false;
   };
 
   vm.getDirectoriesFromBreadcrumbs = function (dir) {
+    if (dir === 'root') {
+      vm.showFolderAction = true;
+      vm.showUploadButton = true;
+    } else {
+      vm.showFolderAction = false;
+      vm.showUploadButton = false;
+    }
     vm.breadcrumbPathClicked = true;
     vm.siteDirectories = [];
     vm.siteFiles = [];
@@ -656,6 +665,7 @@ app.controller('websiteCtrl', [
         vm.showInviteContainer = true;
         vm.websiteTiles = true;
         vm.showBackBtn = true;
+        vm.displayFileTree = true;
       break;
       case 'shares':
         vm.showSharesContainer = true;
@@ -676,6 +686,7 @@ app.controller('websiteCtrl', [
       vm.showInviteContainer = false;
       vm.showSharesContainer = false;
       vm.showFilesContainer = false;
+      vm.displayFileTree = false;
       vm.websiteTiles = false;
       vm.showBackBtn = false;
     }, 150);
diff --git a/templates/website.html b/templates/website.html
index 4bd9000..6e2b735 100644
--- a/templates/website.html
+++ b/templates/website.html
@@ -230,8 +230,8 @@
           </div>
         </div>
         <div class="modal-footer ">
-          <button type="button" class="btn btn-primary pull-left" ng-show="vm.showBackBtn" ng-click="vm.closeAllOpenActions()">Back</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="vm.closeAllOpenActions()">Close</button>
+          <button type="button" class="btn btn-primary pull-left" ng-show="vm.showBackBtn" ng-click="vm.closeAllOpenActions();">Back</button>
+          <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="vm.closeAllOpenActions();">Close</button>
         </div>
       </div>
     </div>
diff --git a/templates/widgets/filetree.html b/templates/widgets/filetree.html
index 7171aa9..a271873 100644
--- a/templates/widgets/filetree.html
+++ b/templates/widgets/filetree.html
@@ -1,7 +1,7 @@
-<div class="text-left">
+<div class="text-left" ng-hide="vm.displayFileTree">
   <div class="row">
     <ul class="breadcrumb">
-      <li ng-repeat="breadcrumb in vm.breadcrumbs track by $index" ng-click="vm.getDirectoriesFromBreadcrumbs(breadcrumb);  vm.showUploadContainer = false; vm.showUploadFolderContainer = false; vm.showUploadFilesContainer = false; vm.showUploadButton = true;" data="{{ breadcrumb }}" class="cp breadcrumbs-list">
+      <li ng-repeat="breadcrumb in vm.breadcrumbs track by $index" ng-click="vm.getDirectoriesFromBreadcrumbs(breadcrumb);  vm.showUploadContainer = false; vm.showUploadFolderContainer = false; vm.showUploadFilesContainer = false;" data="{{ breadcrumb }}" class="cp breadcrumbs-list">
         {{ breadcrumb | capitalize }}
       </li>
     </ul>
@@ -23,11 +23,11 @@
         <hr>
         <div class="">
           <button type="button" name="button" class="btn btn-block btn-primary" ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false" ng-show="vm.showUploadButton">Upload files</button>
-          <button type="button" name="button" class="btn btn-block btn-primary">Share folder</button>
+          <button type="button" name="button" class="btn btn-block btn-primary" ng-click="vm.showAction('invite');">Share folder</button>
           <ul class="ls-none folder-actions-list">
-            <li class="{{ vm.currentFolder }}" ng-hide="vm.showUploadButton"><span><i class="fa fa-upload cp"></i> <a ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false;" class="cp">Upload files</a></span></li>
+            <li class="" ng-hide="vm.showFolderAction"><span><i class="fa fa-upload cp"></i> <a ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false;" class="cp">Upload files</a></span></li>
             <li class=""><span><i class="fa fa-folder cp"></i> <a ng-click="vm.showUploadFolderContainer = true;  vm.cleanPath(); vm.showUploadFilesContainer = false;" class="cp">New folder</a></span></li>
-            <li class="{{ vm.currentFolder }}"><span><i class="fa fa-trash cp"></i> <a ng-click="vm.triggerDeleteFolder(vm.currentFolder, r)" data="{{ vm.currentFolder }}" data="{{ r }}" class="cp">Delete {{ vm.currentFolder | capitalize }} Folder</a></span></li>
+            <li ng-hide="vm.showUploadButton"><span><i class="fa fa-trash cp"></i> <a ng-click="vm.triggerDeleteFolder(vm.currentFolder, r)" data="{{ vm.currentFolder }}" data="{{ r }}" class="cp">Delete {{ vm.currentFolder | capitalize }} Folder</a></span></li>
           </ul>
         </div>
       </div>