diff --git a/app/Http/Controllers/FileFunctions/ShareController.php b/app/Http/Controllers/FileFunctions/ShareController.php
index 98eee2d0..e5ec465e 100644
--- a/app/Http/Controllers/FileFunctions/ShareController.php
+++ b/app/Http/Controllers/FileFunctions/ShareController.php
@@ -96,16 +96,16 @@ class ShareController extends Controller
      */
     public function destroy(Request $request)
     {
-        foreach($request->input('tokens') as $folder) {
+        foreach($request->input('tokens') as $token) {
 
             // Get sharing record
-            Share::where('token', $folder['token'])
+            Share::where('token', $token)
                 ->where('user_id', Auth::id())
                 ->firstOrFail()
                 ->delete();
 
             // Get zip record
-            $zip = Zip::where('shared_token', $folder['token'])
+            $zip = Zip::where('shared_token', $token)
                 ->where('user_id', Auth::id())
                 ->first();
 
diff --git a/app/User.php b/app/User.php
index bfc7cdf6..07d9e34f 100644
--- a/app/User.php
+++ b/app/User.php
@@ -196,13 +196,11 @@ class User extends Authenticatable
     public function getFolderTreeAttribute()
     {
         // Get sorting setup
-        $sort = strtolower(request()->input('sort'));
-        $direction = strtolower(request()->input('direction'));
 
         return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('parent_id', 0)
             ->where('user_id', $this->id)
-            ->sortable($sort , $direction)
+            ->sortable()
             ->get();
     }
 
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 836fcc6c..d21d1d4a 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,65 +1,149 @@
 {
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=f9e2884f49a692b2dc37",
-    "/js/main.js": "/js/main.js?id=f84b0c22d69ac92df246",
-    "/css/app.css": "/css/app.css?id=8f6d5dcb7110a726e142",
-    "/chunks/admin.js": "/chunks/admin.js?id=5c1ef019716afc67775b",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=16cd99641f6c1cb6788a",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=3043f5ab051b9cac9ab7",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=b4d28bec8835085f885f",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=24fc0cc212e9b893bb09",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=c1c8101bd90f630ac6bf",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=c73372ee9f62d01c74d1",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=83608af3a7e34ac062d4",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=466c6bfc5ab7b883e443",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=652f0ab8a6423dd24906",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=b955f8dcd6890a1b45ca",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=a5150dcf81c8e1ab23a4",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=58c543c4f92b5ca9a284",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=6dfd3a558e6c5d943dbc",
-    "/chunks/database.js": "/chunks/database.js?id=dbb3c73c995c7ee55015",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=08a0c2de8f93e0222600",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=3b6455db55e44d265c86",
-    "/chunks/files.js": "/chunks/files.js?id=6f430d943830045b9386",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7ff98232e7b4cc5d2c2a",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=f8a13783dc40aad197b5",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=2bf3d16c86c9a512d7cd",
-    "/chunks/landing-page.js": "/chunks/landing-page.js?id=00d49e4ffb54dc5abb5b",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=53d4f9c58bdac1e568c7",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=e3dbad6c75184042d2e6",
-    "/chunks/pages.js": "/chunks/pages.js?id=178f763a036b4ee9a366",
-    "/chunks/plan.js": "/chunks/plan.js?id=7ea9ddff467ab749441a",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=b40c3e16a94a55fc9397",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=61c8edfbdad6904435ed",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=2be8a0aaf9e6968e158e",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=60b05b4391ec24649eaf",
-    "/chunks/plans.js": "/chunks/plans.js?id=dccd289b5aeda9003aca",
-    "/chunks/profile.js": "/chunks/profile.js?id=91714cf4f6ca568515d6",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=82446c77da50e52cf1bd",
-    "/chunks/settings.js": "/chunks/settings.js?id=0cfc9ad9196a31d29811",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=72bc6c0599e6d6095ddd",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=daad8173619d5d047c0d",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=9424e701a221958e50e8",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=66ad9cb43ef678407e3e",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6af5afc7c03b54e80984",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=1be617484ada2cd04bd7",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=040ad18de0a2504c0f63",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=a563d5d477a6b8c5c536",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=ec080714b24154cf1081",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=0d8b571bcf5a54f073fd",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=099fd6800da190981a1c",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=a1582c9b65d4b9df716e",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=67403d4466f7e7c5701d",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=a414b418fb4f7c37287f",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=985dd231a8395f6a01d2",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=a66c2011e6e99d0880de",
-    "/chunks/user.js": "/chunks/user.js?id=614b75d3e823cde8ab9f",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=2bd3bf90450c1ae1a9e1",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=08acb6b552540d60131f",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=cf402ad5f8e4a19bfa6c",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=968a95bf02cb6a5cf064",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=59afc7db6a7c0b40781e",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=cb0b4bfb94595993795f",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=893d245c41391543de25",
-    "/chunks/users.js": "/chunks/users.js?id=3b3ae7c11ce24170045c"
+    "/js/main.js": "/js/main.js",
+    "/css/app.css": "/css/app.css",
+    "/chunks/admin.js": "/chunks/admin.js?id=d9ef79cabf24df304657",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=63c04ed6eb66b99be097",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=07b0ad73181498d46930",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=6cb8c3f7a9aed769ec61",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=7480293537e480966ae0",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b99a5c881b7f15a7e8c5",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=9e50edacd8630aa6fc22",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=b6dbd27dc777d0878f4b",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=d2dd97078c9919b69378",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=aac5bd51067578358164",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=9d1631b19f6492b8cae4",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=ec7605e0fcf922be3dbc",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=6fc74fefe17af6d3dd6c",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=187ecc16f9f7fbc4ccac",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=033223b2f39c72c71a73",
+    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=52e8a931f975c4e03a3c",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=8038cc956f309a321a7c",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=bbfc290b50cebb202228",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=4dc0385ff5abe06d164e",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=a4b8a7017c82de28296b",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=108dcc4b5af4c973be56",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=0d6a659fb1deb6dc869f",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.js?id=6517ff6bfe91291e3335",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=cc1b4cbd4aa7f70151f7",
+    "/chunks/database.js": "/chunks/database.js?id=ce57f3e69798319aab7b",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f7ff36abf37571173944",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=48efd0b887fbc804ac90",
+    "/chunks/files.js": "/chunks/files.js?id=2a3e5515b8cba5885197",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=40f7ece1d6dd0f35d6a7",
+    "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=f037ea11689d01ea489e",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=f47a0917a085ad2ebfd4",
+    "/chunks/landing-page.js": "/chunks/landing-page.js?id=963140915655ff33f611",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=8c8ee101f3445e086040",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=0952cc3fb3aa4797a679",
+    "/chunks/pages.js": "/chunks/pages.js?id=ca63cff0863297ddf1e5",
+    "/chunks/plan.js": "/chunks/plan.js?id=41d7a74e57ac07ce3619",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=8d1c89c91afa65224225",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=4da54a76628aef67ea3e",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e608674e1719be65fe6f",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8655313c7b71b1019c8f",
+    "/chunks/plans.js": "/chunks/plans.js?id=24a18f62ef10a422e464",
+    "/chunks/profile.js": "/chunks/profile.js?id=1e629aa55540ed106ce7",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f9e2ea1515204b5c63b6",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=91a470e84a34587f3944",
+    "/chunks/settings.js": "/chunks/settings.js?id=87d29c7fd4e0e6f1a3bd",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=8bc4707d554ffca037a1",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=f5c1b720a5b12060b83b",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=0229d51aca95ffc75902",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=e7a99d16c2c21bcb9598",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0ec77e47b2622ee5e253",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=00c6bca64820c4fd3a89",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=b671f4f3198119b48449",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=b13068f12911fbf79f74",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=b22b072500c256e062e5",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=0212907c9bf1cdbd99ed",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=91001c0d2c2522eb0d03",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=0e90002c41282e286785",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=6ceb34852ec8a0280aef",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=7176521fbf0047110ae1",
+    "/chunks/upgrade.js": "/chunks/upgrade.js?id=84fa2517046334070313",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=816be29562b9052cabb1",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=a589c99d29f03bc71487",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=8bf12e8b93c7eaee4171",
+    "/chunks/user.js": "/chunks/user.js?id=bdb8a51693952859f5e1",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=d0056a5db2089bc05508",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=91d17d44835dd32ec36f",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=b5b474dd8fea7b99c766",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=68ea653f6d345e469307",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=ac51d17a4aa7ae50bc88",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=34603496ceacb8bd2da3",
+    "/chunks/users.js": "/chunks/users.js?id=d97166d7e60c1ec9facb",
+    "/js/main.1a313190c879577b5ed4.hot-update.js": "/js/main.1a313190c879577b5ed4.hot-update.js",
+    "/js/main.c4d08ab0b12b48eebb7f.hot-update.js": "/js/main.c4d08ab0b12b48eebb7f.hot-update.js",
+    "/js/main.0d14b52f01d9caae3e17.hot-update.js": "/js/main.0d14b52f01d9caae3e17.hot-update.js",
+    "/js/main.b73ca5391e55f4e8a26e.hot-update.js": "/js/main.b73ca5391e55f4e8a26e.hot-update.js",
+    "/js/main.7a42fb736b5addf910a4.hot-update.js": "/js/main.7a42fb736b5addf910a4.hot-update.js",
+    "/js/main.195201b9cdff762aa769.hot-update.js": "/js/main.195201b9cdff762aa769.hot-update.js",
+    "/js/main.00b6a23abd1d551ed1f3.hot-update.js": "/js/main.00b6a23abd1d551ed1f3.hot-update.js",
+    "/js/main.ef77b17643e02eb6f5ba.hot-update.js": "/js/main.ef77b17643e02eb6f5ba.hot-update.js",
+    "/js/main.e07a0a81bb460edd2b3e.hot-update.js": "/js/main.e07a0a81bb460edd2b3e.hot-update.js",
+    "/js/main.c4176b26e7b6c3b8c783.hot-update.js": "/js/main.c4176b26e7b6c3b8c783.hot-update.js",
+    "/js/main.fc6063a394fef1c8c4d6.hot-update.js": "/js/main.fc6063a394fef1c8c4d6.hot-update.js",
+    "/js/main.bf57da99734493b299cb.hot-update.js": "/js/main.bf57da99734493b299cb.hot-update.js",
+    "/js/main.635a6bda1cef8d531cb3.hot-update.js": "/js/main.635a6bda1cef8d531cb3.hot-update.js",
+    "/js/main.f785da637709d3640d36.hot-update.js": "/js/main.f785da637709d3640d36.hot-update.js",
+    "/js/main.e77c585cd79dee698934.hot-update.js": "/js/main.e77c585cd79dee698934.hot-update.js",
+    "/js/main.8fab54162eef8b717ca1.hot-update.js": "/js/main.8fab54162eef8b717ca1.hot-update.js",
+    "/js/main.3fb845e4403d99ec4d21.hot-update.js": "/js/main.3fb845e4403d99ec4d21.hot-update.js",
+    "/js/main.58f46ce6ed6702d9e0a7.hot-update.js": "/js/main.58f46ce6ed6702d9e0a7.hot-update.js",
+    "/js/main.5d8f80d9565f22ace2c1.hot-update.js": "/js/main.5d8f80d9565f22ace2c1.hot-update.js",
+    "/js/main.52b9795e8ee0cc71eac5.hot-update.js": "/js/main.52b9795e8ee0cc71eac5.hot-update.js",
+    "/js/main.bc5a1511241a3f7a3c86.hot-update.js": "/js/main.bc5a1511241a3f7a3c86.hot-update.js",
+    "/js/main.0a61ea1ddc0e7e5a5155.hot-update.js": "/js/main.0a61ea1ddc0e7e5a5155.hot-update.js",
+    "/js/main.b41751816f730875da10.hot-update.js": "/js/main.b41751816f730875da10.hot-update.js",
+    "/js/main.0e59dd38e8778ed76be2.hot-update.js": "/js/main.0e59dd38e8778ed76be2.hot-update.js",
+    "/js/main.53da47d2b364b6cc3581.hot-update.js": "/js/main.53da47d2b364b6cc3581.hot-update.js",
+    "/js/main.5461a23dd04b09891b6a.hot-update.js": "/js/main.5461a23dd04b09891b6a.hot-update.js",
+    "/js/main.e98e8a196d5f48fe41bc.hot-update.js": "/js/main.e98e8a196d5f48fe41bc.hot-update.js",
+    "/js/main.0b1bc210203fe8a70de1.hot-update.js": "/js/main.0b1bc210203fe8a70de1.hot-update.js",
+    "/js/main.ed0b57a74e316afaad8d.hot-update.js": "/js/main.ed0b57a74e316afaad8d.hot-update.js",
+    "/js/main.ed9de4d2f03cb20d3ca8.hot-update.js": "/js/main.ed9de4d2f03cb20d3ca8.hot-update.js",
+    "/js/main.882a46c83b084056482f.hot-update.js": "/js/main.882a46c83b084056482f.hot-update.js",
+    "/js/main.f2f4e97d4b8e1f98a8ac.hot-update.js": "/js/main.f2f4e97d4b8e1f98a8ac.hot-update.js",
+    "/js/main.413e6fbba3599d42252c.hot-update.js": "/js/main.413e6fbba3599d42252c.hot-update.js",
+    "/js/main.05c09878a50d5e2a305c.hot-update.js": "/js/main.05c09878a50d5e2a305c.hot-update.js",
+    "/js/main.f730012b9585844ce1a4.hot-update.js": "/js/main.f730012b9585844ce1a4.hot-update.js",
+    "/js/main.a789c768f4eb07802456.hot-update.js": "/js/main.a789c768f4eb07802456.hot-update.js",
+    "/js/main.f84fdee5c48c0221a5fb.hot-update.js": "/js/main.f84fdee5c48c0221a5fb.hot-update.js",
+    "/js/main.c3e8b77d8ba57216afdb.hot-update.js": "/js/main.c3e8b77d8ba57216afdb.hot-update.js",
+    "/js/main.c66b62154813d9effd51.hot-update.js": "/js/main.c66b62154813d9effd51.hot-update.js",
+    "/js/main.fbd606019bab5ff1d83b.hot-update.js": "/js/main.fbd606019bab5ff1d83b.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.13b92a5d36e123415343.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.13b92a5d36e123415343.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b91ce4aabecbc23aa5b2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b91ce4aabecbc23aa5b2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.3f1e3c55eb4947561e2e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3f1e3c55eb4947561e2e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.642d9072c736d6cb52f6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.642d9072c736d6cb52f6.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.814dcfadb7c7519346b8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.814dcfadb7c7519346b8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b05818cfa55c11923ffb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b05818cfa55c11923ffb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fd85b6e6355e2c9aaa27.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fd85b6e6355e2c9aaa27.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fea04ee618ba692ba63a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fea04ee618ba692ba63a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.39ef5d6ea18f3b19ad16.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.39ef5d6ea18f3b19ad16.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.f7f35a2465458a25c440.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f7f35a2465458a25c440.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e733490daf2767589049.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e733490daf2767589049.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.5e73c9cd3ad13fbc424f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5e73c9cd3ad13fbc424f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9aa3c3ba8523a4d703ad.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9aa3c3ba8523a4d703ad.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.dd78e3c3f817dbbf847a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.dd78e3c3f817dbbf847a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8768bebd783735c5cd48.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8768bebd783735c5cd48.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.57b4c22cbf6d3d5f9d43.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.57b4c22cbf6d3d5f9d43.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9f1583ff84b0ddd160b1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9f1583ff84b0ddd160b1.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e5ab1c1a0522c102ad01.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e5ab1c1a0522c102ad01.hot-update.js",
+    "/chunks/files.67f5419ae74c30c2a24d.hot-update.js": "/chunks/files.67f5419ae74c30c2a24d.hot-update.js",
+    "/chunks/shared-files.67f5419ae74c30c2a24d.hot-update.js": "/chunks/shared-files.67f5419ae74c30c2a24d.hot-update.js",
+    "/chunks/files.acb632d54c753496902b.hot-update.js": "/chunks/files.acb632d54c753496902b.hot-update.js",
+    "/chunks/shared-files.acb632d54c753496902b.hot-update.js": "/chunks/shared-files.acb632d54c753496902b.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.5664b36b33db26e35181.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5664b36b33db26e35181.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.18ee97c4211763fbc97b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.18ee97c4211763fbc97b.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.cc6c8f00ca9e08e1c9b7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cc6c8f00ca9e08e1c9b7.hot-update.js",
+    "/chunks/shared-page.dad5115c6423467ff387.hot-update.js": "/chunks/shared-page.dad5115c6423467ff387.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6e51b5e6c0c5c6240420.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6e51b5e6c0c5c6240420.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.61ad074087ad1bb101e7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.61ad074087ad1bb101e7.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.19a72481ebb4deb34abe.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.19a72481ebb4deb34abe.hot-update.js",
+    "/js/main.55e9779b8e5c9eba6696.hot-update.js": "/js/main.55e9779b8e5c9eba6696.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 176aa207..2d511b19 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -137,7 +137,7 @@
         },
         methods: {
             unClick () {
-                events.$emit('sortingAndPreview', false)
+                events.$emit('unClick')
             }
         },
         beforeMount() {
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index f829b936..c5944059 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -574,7 +574,7 @@ export default {
             setTimeout(() => this.showContextMenu(event, item), 10)
         })
 
-        events.$on('contextMenu:hide', () => this.closeAndResetContextMenu())
+        events.$on('unClick', () => this.closeAndResetContextMenu())
 
         events.$on('folder:actions', (folder) => {
             // Store item
diff --git a/resources/js/components/FilesView/DesktopSortingAndPreview.vue b/resources/js/components/FilesView/DesktopSortingAndPreview.vue
index 8caa87f2..6c6453df 100644
--- a/resources/js/components/FilesView/DesktopSortingAndPreview.vue
+++ b/resources/js/components/FilesView/DesktopSortingAndPreview.vue
@@ -6,7 +6,6 @@
 
 <script>
 import SortingAndPreviewMenu from '@/components/FilesView/SortingAndPreviewMenu'
-import { mapGetters } from 'vuex'
 import { events } from '@/bus'
 
     export default {
@@ -21,6 +20,10 @@ import { events } from '@/bus'
             events.$on('sortingAndPreview', (state) => {
                 this.isVisible = state
             })
+
+            events.$on('unClick', () => {
+                this.isVisible = false
+            })
         }
     }
 </script>
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index 96493010..1074f47f 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -149,7 +149,7 @@ export default {
             }
 
             if (!this.sortingAndPreview) {
-                events.$emit('sortingAndPreview', false)
+                events.$emit('unClick')
             }
         }
     },
@@ -186,7 +186,8 @@ export default {
             this.$createFolder()
         },
         moveItem() {
-            events.$emit('popup:open', { name: 'move', item: this.fileInfoDetail })
+            if(this.fileInfoDetail.length > 0)
+                events.$emit('popup:open', { name: 'move', item: this.fileInfoDetail })
         },
         shareItem() {
             if (this.fileInfoDetail[0]) {
@@ -206,9 +207,13 @@ export default {
         }
     },
     mounted() {
-        events.$on('sortingAndPreview', (state) => {
-            this.sortingAndPreview = state
-        })
+        // events.$on('sortingAndPreview', (state) => {
+        //     this.sortingAndPreview = state
+        // })
+
+         events.$on('unClick', () => {
+                this.sortingAndPreview = false
+            })
     }
 }
 </script>
diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue
index 3277dc8b..9fd86232 100644
--- a/resources/js/components/FilesView/FileBrowser.vue
+++ b/resources/js/components/FilesView/FileBrowser.vue
@@ -222,11 +222,9 @@
                 events.$emit('contextMenu:show', event, item)
             },
             filesContainerClick() {
+                
                 // Deselect itms clicked by outside
                 this.$store.commit('CLEAR_FILEINFO_DETAIL')
-
-                // Hide context menu if is opened
-                events.$emit('contextMenu:hide')
             }
         },
         created() {
diff --git a/resources/js/components/FilesView/FileItemGrid.vue b/resources/js/components/FilesView/FileItemGrid.vue
index 1751cfc7..8b8a9cd1 100644
--- a/resources/js/components/FilesView/FileItemGrid.vue
+++ b/resources/js/components/FilesView/FileItemGrid.vue
@@ -32,7 +32,7 @@
             <!--Name-->
             <div class="item-name">
                 <!--Name-->
-                <b ref="name" @input="renameItem" :contenteditable="canEditName" class="name">
+                <b ref="name" @input="renameItem" @keydown.delete.stop :contenteditable="canEditName" class="name">
                     {{ itemName }}
                 </b>
 
@@ -155,9 +155,7 @@ export default {
             this.area = false
         },
         clickedItem(e) {
-            events.$emit('contextMenu:hide')
-
-            events.$emit('sortingAndPreview', false)
+            events.$emit('unClick')
 
             if (!this.$isMobile()) {
                 if (e.ctrlKey || e.metaKey && !e.shiftKey) {
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index c280efae..354ee791 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -42,7 +42,7 @@
 			<!--Name-->
 			<div class="item-name">
 				<!--Name-->
-				<b ref="name" @input="renameItem" :contenteditable="canEditName" class="name">
+				<b ref="name" @input="renameItem" @keydown.delete.stop :contenteditable="canEditName" class="name">
 					{{ itemName }}
 				</b>
 
@@ -166,9 +166,7 @@ export default {
 			this.area = false
 		},
 		clickedItem(e) {
-			events.$emit('contextMenu:hide')
-
-        	events.$emit('sortingAndPreview', false)
+			events.$emit('unClick')
 			
 			if(!this.$isMobile()) {
 
diff --git a/resources/js/components/FilesView/MobileMultiSelectMenu.vue b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
index 36934060..2448ec1e 100644
--- a/resources/js/components/FilesView/MobileMultiSelectMenu.vue
+++ b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
@@ -1,12 +1,14 @@
 <template>
     <transition name="context-menu">
         <div class="multiselect-actions" v-if="mobileMultiSelect">
-            <ToolbarButton class="action-btn" v-if="!$isThisLocation(['trash', 'trash-root']) && $checkPermission('master') || $checkPermission('editor')" source="move" :action="$t('actions.move')" :class="{'is-inactive' : fileInfoDetail.length < 1}" @click.native="moveItem"/>
+            <ToolbarButton class="action-btn" v-if="!$isThisLocation(['trash', 'trash-root' , 'shared', 'latest']) && $checkPermission('master') || $checkPermission('editor')" source="move" :action="$t('actions.move')" :class="{'is-inactive' : fileInfoDetail.length < 1}" @click.native="moveItem"/>
 
-            <ToolbarButton class="action-btn" v-if="$checkPermission('master') || $checkPermission('editor')" source="trash" :class="{'is-inactive' : fileInfoDetail.length < 1}" :action="$t('actions.delete')" @click.native="deleteItem"/>
+            <ToolbarButton class="action-btn" v-if="!$isThisLocation(['shared']) && $checkPermission('master') || $checkPermission('editor')" source="trash" :class="{'is-inactive' : fileInfoDetail.length < 1}" :action="$t('actions.delete')" @click.native="deleteItem"/>
 
-            <ToolbarButton class="action-btn" source="download" :class="{'is-inactive': canDownloadItems}" :action="$t('actions.delete')" @click.native="downloadItem"/>
+            <ToolbarButton class="action-btn" v-if="!$isThisLocation(['shared'])" source="download" :class="{'is-inactive': canDownloadItems}" :action="$t('actions.delete')" @click.native="downloadItem"/>
 
+            <ToolbarButton class="action-btn" source="shared-off" @click.native="shareCancel" v-if="$isThisLocation(['shared'])"/>
+            
             <ToolbarButton class="action-btn close-icon" source="close" :action="$t('actions.close')" @click.native="closeSelecting"/>
         </div>
     </transition>
@@ -32,6 +34,10 @@ export default {
         }
     },
     methods: {
+         shareCancel() {
+            this.$store.dispatch('shareCancel')
+            this.closeSelecting()
+        },
         closeSelecting() {
             events.$emit('mobileSelecting:stop')
         },
@@ -41,14 +47,17 @@ export default {
             else {
                 this.$downloadFile(this.fileInfoDetail[0].file_url, this.fileInfoDetail[0].name + '.' + this.fileInfoDetail[0].mimetype)
             }
+            this.closeSelecting()
         },
         moveItem() {
             // Open move item popup
             events.$emit('popup:open', { name: 'move', item: [this.fileInfoDetail[0]] })
+            this.closeSelecting()
         },
         deleteItem() {
             //Delete items
             this.$store.dispatch('deleteItem')
+            this.closeSelecting()
         }
     },
     created() {
diff --git a/resources/js/components/FilesView/MobileSortingAndPreview.vue b/resources/js/components/FilesView/MobileSortingAndPreview.vue
index df617f23..b935482f 100644
--- a/resources/js/components/FilesView/MobileSortingAndPreview.vue
+++ b/resources/js/components/FilesView/MobileSortingAndPreview.vue
@@ -6,7 +6,6 @@
 
 <script>
 import SortingAndPreviewMenu from '@/components/FilesView/SortingAndPreviewMenu'
-import { mapGetters } from 'vuex'
 import { events } from '@/bus'
 
     export default {
diff --git a/resources/js/components/FilesView/ToolbarButton.vue b/resources/js/components/FilesView/ToolbarButton.vue
index 1eec7eba..20a4f04c 100644
--- a/resources/js/components/FilesView/ToolbarButton.vue
+++ b/resources/js/components/FilesView/ToolbarButton.vue
@@ -20,6 +20,7 @@
     <grid-icon v-if="source === 'th'" size="19"></grid-icon>
     <link-icon v-if="source === 'share'" size="19"></link-icon>
     <x-icon v-if="source === 'close'" size="19"></x-icon>
+    <cloud-off-icon v-if="source === 'shared-off'" size="19"></cloud-off-icon>
 
     <svg v-if="source === 'preview-sorting'" size="19"
       width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -55,6 +56,7 @@ import {
   DownloadCloudIcon,
   XIcon,
   PrinterIcon,
+  CloudOffIcon,
 } from "vue-feather-icons";
 
 export default {
@@ -64,6 +66,7 @@ export default {
     CornerDownRightIcon,
     DownloadCloudIcon,
     FolderPlusIcon,
+    CloudOffIcon,
     PrinterIcon,
     Trash2Icon,
     Edit2Icon,
diff --git a/resources/js/components/Others/ContentFileView.vue b/resources/js/components/Others/ContentFileView.vue
index 96effdf5..f4ff9308 100644
--- a/resources/js/components/Others/ContentFileView.vue
+++ b/resources/js/components/Others/ContentFileView.vue
@@ -1,6 +1,5 @@
 <template>
-    <div @click="fileViewClick"
-         @contextmenu.prevent.capture="contextMenu($event, undefined)"
+    <div @contextmenu.prevent.capture="contextMenu($event, undefined)"
          id="files-view">
         <ContextMenu/>
         <DesktopSortingAndPreview/>
@@ -29,9 +28,6 @@
             ...mapGetters(['config']),
         },
         methods: {
-            fileViewClick() {
-                events.$emit('contextMenu:hide')
-            },
             contextMenu(event, item) {
                 events.$emit('contextMenu:show', event, item)
             },
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index e185263c..fe9a2291 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -237,11 +237,10 @@ const actions = {
         let items = [noSelectedItem]
        
          //If coming no selected item dont get items to move from fileInfoDetail
-        if(!noSelectedItem) {
+        if(!noSelectedItem) 
             items = getters.fileInfoDetail
-        }
         
-        items.forEach((data) => {
+        items.forEach(data => {
             itemsToDelete.push({
                 'force_delete': data.deleted_at ? true : false,
                 'type': data.type,
diff --git a/resources/js/store/modules/sharing.js b/resources/js/store/modules/sharing.js
index f7d39e2e..c1d18f0b 100644
--- a/resources/js/store/modules/sharing.js
+++ b/resources/js/store/modules/sharing.js
@@ -68,27 +68,25 @@ const actions = {
     shareCancel: ({commit, getters} , singleItem) => {
         return new Promise((resolve, reject) => {
 
-            let cancelSharedFolders = []
+            let tokens = []
             let items = [singleItem]
 
             if(!singleItem) {
                 items = getters.fileInfoDetail
             }
 
-            items.forEach((data) => {
-                cancelSharedFolders.push({
-                    'token': data.shared.token
-                })
+            items.forEach(data => {
+                tokens.push(data.shared.token)
             })
 
             axios
                 .post('/api/share/cancel', {
                     _method: 'post',
-                    folders: cancelSharedFolders
+                    tokens: tokens
                 })
                 .then(() => {
 
-                    items.forEach((item) => {
+                    items.forEach(item => {
 
                         // Remove item from file browser
                         if ( getters.currentFolder , getters.currentFolder.location === 'shared' ) {
diff --git a/resources/js/views/Shared/SharedPage.vue b/resources/js/views/Shared/SharedPage.vue
index 98178a07..a2336ac1 100644
--- a/resources/js/views/Shared/SharedPage.vue
+++ b/resources/js/views/Shared/SharedPage.vue
@@ -67,7 +67,6 @@
         <!--Multiple items view page-->
         <div v-if="sharedDetail.type === 'folder' && isPageFiles"
              @contextmenu.prevent.capture="contextMenu($event, undefined)"
-             @click="fileViewClick"
              id="viewport">
 
                 <ContentSidebar v-if="navigationTree">
@@ -267,9 +266,6 @@
             download() {
                 this.$downloadFile(this.sharedFile.file_url, this.sharedFile.name + '.' + this.sharedFile.mimetype)
             },
-            fileViewClick() {
-                events.$emit('contextMenu:hide')
-            },
             contextMenu(event, item) {
                 events.$emit('contextMenu:show', event, item)
             },