diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d43c6335..dd7707f8 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -36,7 +36,7 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
-    "/chunks/files.js": "/chunks/files.js?id=5678aec50204dfafee5a",
+    "/chunks/files.js": "/chunks/files.js?id=008e84b3f4decfc8f3d0",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js?id=c6ab649e67651e0b9f18",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js?id=4f10f893c25e398f40bc",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js?id=593b877c4ab874ceccfe",
@@ -49,7 +49,7 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=6f2aac612b4c6eaabf61",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a5b0819b57321599f235",
     "/chunks/invoices.js": "/chunks/invoices.js?id=f0360ddfb0f1e1a9058b",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=bc5785e11ec2e215229b",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=a5841fea1d8baef93903",
     "/chunks/not-found.js": "/chunks/not-found.js?id=8e5c99340188c2a7b215",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=3d194f15e25dec1c54d3",
     "/chunks/pages.js": "/chunks/pages.js?id=bfd9a2e2c52e60ed025e",
@@ -59,14 +59,14 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
     "/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
-    "/chunks/platform.js": "/chunks/platform.js?id=1961d3ff45861ab12b2e",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=7e1b520699fcd958093d",
+    "/chunks/platform.js": "/chunks/platform.js?id=556ace58951861df91e3",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=f390cfb14f16a43b596f",
     "/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=b142ad8801528b166787",
     "/chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6ba92eab6a45cbab3af5",
     "/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=4b176796d100a2b24d71",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=808b27b4d0bf98bf5ed7",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=debec75125f952172cf6",
     "/chunks/settings.js": "/chunks/settings.js?id=a1e5e739768b788a043a",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0656db2b76eaa0de2c58",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=29fbd676788295256ffe",
@@ -76,17 +76,17 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=51b246c660e78c9263b5",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=680f99e2021f19ff1af8",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=8a499266af9527039582",
-    "/chunks/shared.js": "/chunks/shared.js?id=94f65ed85832e888dd3e",
+    "/chunks/shared.js": "/chunks/shared.js?id=8408b04cd6d5e0a4880b",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=30b0b0d1930a1952648a",
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=02bb2b1a5518a1f73b2a",
-    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b733dc84cd8e05a8f6f3",
+    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=453f36d6716f716561bc",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=d5eed76acdad4d2c0b9b",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=f092210474e42bfd4525",
     "/chunks/status-check.js": "/chunks/status-check.js?id=b7d0389078014db8a563",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=2802cde66f7d12ec8442",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5dbfd83cfacad270a636",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=721e855dff920e5e6996",
-    "/chunks/trash.js": "/chunks/trash.js?id=16d5b490b6ca3924e977",
+    "/chunks/trash.js": "/chunks/trash.js?id=6e4c0210fc214cd9a886",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8879f5c458f08648405a",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e365ae16373be9dbd458",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=fc8183dc546683a9b60f",
@@ -130,15 +130,15 @@
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/files.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/files.js?id=dba77fc6b158bc3c2e4e",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~477ccadb.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~477ccadb.js?id=914f040c5966894873f8",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js?id=eb26643e072aa1f2b4b5",
-    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=61760c506a36f8fc3414",
-    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js?id=5cda983d60a85c9168e9",
-    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=f9f2e41ad11f62057c58",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=d9f34d135b119c4c16e4",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js?id=b1513a3d0291b8faaca0",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=5e3a519320d1539aee55",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js?id=5216516ba11c29601c91",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=6966f455db86cfa3ac1d",
-    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=21ce7c8e1167b492c6fc",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=bb4aa02e40bf23c6a83b",
     "/chunks/platform~chunks/shared/files.js": "/chunks/platform~chunks/shared/files.js?id=a1891e149640c9a838f4",
     "/chunks/platform~chunks/shared~chunks/shared/files.js": "/chunks/platform~chunks/shared~chunks/shared/files.js?id=1ed2d41883a929aa1bc7",
-    "/chunks/shared/files.js": "/chunks/shared/files.js?id=e79846629f8ee34e0ee1",
+    "/chunks/shared/files.js": "/chunks/shared/files.js?id=72c40adeb04d35c60de4",
     "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js?id=9af0690154c8bf6d4ef8",
     "/js/main.d74018fe5b56d003aae4.hot-update.js": "/js/main.d74018fe5b56d003aae4.hot-update.js",
     "/js/main.ba6f6df8b0f4192825fe.hot-update.js": "/js/main.ba6f6df8b0f4192825fe.hot-update.js",
@@ -280,5 +280,93 @@
     "/js/main.d8795fe465011e10f4c2.hot-update.js": "/js/main.d8795fe465011e10f4c2.hot-update.js",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.d8795fe465011e10f4c2.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.d8795fe465011e10f4c2.hot-update.js",
     "/js/main.4fea36154a307113ca40.hot-update.js": "/js/main.4fea36154a307113ca40.hot-update.js",
-    "/js/main.02000e1bbba29a831689.hot-update.js": "/js/main.02000e1bbba29a831689.hot-update.js"
+    "/js/main.02000e1bbba29a831689.hot-update.js": "/js/main.02000e1bbba29a831689.hot-update.js",
+    "/js/main.d336da8acb0efa4cc651.hot-update.js": "/js/main.d336da8acb0efa4cc651.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d336da8acb0efa4cc651.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d336da8acb0efa4cc651.hot-update.js",
+    "/chunks/admin~chunks/settings.js": "/chunks/admin~chunks/settings.js?id=314e35b4f2f458accaeb",
+    "/chunks/platform.d336da8acb0efa4cc651.hot-update.js": "/chunks/platform.d336da8acb0efa4cc651.hot-update.js",
+    "/chunks/platform~chunks/shared.d336da8acb0efa4cc651.hot-update.js": "/chunks/platform~chunks/shared.d336da8acb0efa4cc651.hot-update.js",
+    "/chunks/shared.d336da8acb0efa4cc651.hot-update.js": "/chunks/shared.d336da8acb0efa4cc651.hot-update.js",
+    "/js/main.37e5b8a5338827f4cea7.hot-update.js": "/js/main.37e5b8a5338827f4cea7.hot-update.js",
+    "/chunks/platform.37e5b8a5338827f4cea7.hot-update.js": "/chunks/platform.37e5b8a5338827f4cea7.hot-update.js",
+    "/chunks/platform~chunks/shared.37e5b8a5338827f4cea7.hot-update.js": "/chunks/platform~chunks/shared.37e5b8a5338827f4cea7.hot-update.js",
+    "/chunks/shared.37e5b8a5338827f4cea7.hot-update.js": "/chunks/shared.37e5b8a5338827f4cea7.hot-update.js",
+    "/js/main.628d38fd182322b3ae4a.hot-update.js": "/js/main.628d38fd182322b3ae4a.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.628d38fd182322b3ae4a.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.628d38fd182322b3ae4a.hot-update.js",
+    "/chunks/platform.628d38fd182322b3ae4a.hot-update.js": "/chunks/platform.628d38fd182322b3ae4a.hot-update.js",
+    "/chunks/platform~chunks/shared.628d38fd182322b3ae4a.hot-update.js": "/chunks/platform~chunks/shared.628d38fd182322b3ae4a.hot-update.js",
+    "/chunks/shared.628d38fd182322b3ae4a.hot-update.js": "/chunks/shared.628d38fd182322b3ae4a.hot-update.js",
+    "/js/main.5e5b951833c1f790c00b.hot-update.js": "/js/main.5e5b951833c1f790c00b.hot-update.js",
+    "/chunks/platform.5e5b951833c1f790c00b.hot-update.js": "/chunks/platform.5e5b951833c1f790c00b.hot-update.js",
+    "/chunks/platform~chunks/shared.5e5b951833c1f790c00b.hot-update.js": "/chunks/platform~chunks/shared.5e5b951833c1f790c00b.hot-update.js",
+    "/chunks/shared.5e5b951833c1f790c00b.hot-update.js": "/chunks/shared.5e5b951833c1f790c00b.hot-update.js",
+    "/js/main.59e9a7b43a121d691262.hot-update.js": "/js/main.59e9a7b43a121d691262.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.59e9a7b43a121d691262.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.59e9a7b43a121d691262.hot-update.js",
+    "/chunks/platform.59e9a7b43a121d691262.hot-update.js": "/chunks/platform.59e9a7b43a121d691262.hot-update.js",
+    "/chunks/platform~chunks/shared.59e9a7b43a121d691262.hot-update.js": "/chunks/platform~chunks/shared.59e9a7b43a121d691262.hot-update.js",
+    "/chunks/shared.59e9a7b43a121d691262.hot-update.js": "/chunks/shared.59e9a7b43a121d691262.hot-update.js",
+    "/js/main.12ac538c32017bb983a6.hot-update.js": "/js/main.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=59074b17364de03f8de9",
+    "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~b388a191.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~b388a191.js?id=bf46ab8ad8ee5dc6bc53",
+    "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~8e71da83.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~8e71da83.js?id=832cd72f4d7323367509",
+    "/chunks/files.12ac538c32017bb983a6.hot-update.js": "/chunks/files.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/my-shared-items.12ac538c32017bb983a6.hot-update.js": "/chunks/my-shared-items.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/platform~chunks/shared~chunks/shared/single-file.js": "/chunks/platform~chunks/shared~chunks/shared/single-file.js?id=8e56c14552730c5302ee",
+    "/chunks/recent-uploads.12ac538c32017bb983a6.hot-update.js": "/chunks/recent-uploads.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/settings-subscription.12ac538c32017bb983a6.hot-update.js": "/chunks/settings-subscription.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/settings-subscription~chunks/user-subscription.js": "/chunks/settings-subscription~chunks/user-subscription.js?id=ffae4803837130c6360e",
+    "/chunks/shared/files.12ac538c32017bb983a6.hot-update.js": "/chunks/shared/files.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/trash.12ac538c32017bb983a6.hot-update.js": "/chunks/trash.12ac538c32017bb983a6.hot-update.js",
+    "/chunks/user-subscription.12ac538c32017bb983a6.hot-update.js": "/chunks/user-subscription.12ac538c32017bb983a6.hot-update.js",
+    "/vendors~chunks/platform~chunks/shared~chunks/shared/single-file.js": "/vendors~chunks/platform~chunks/shared~chunks/shared/single-file.js?id=b00184c0940c415c5849",
+    "/js/main.02d1b3648e3412d4d9e9.hot-update.js": "/js/main.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/files.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/files.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/my-shared-items.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/my-shared-items.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/platform.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/platform.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/platform~chunks/shared.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/platform~chunks/shared.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/recent-uploads.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/recent-uploads.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/shared.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/shared.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/shared/files.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/shared/files.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/shared/single-file.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/shared/single-file.02d1b3648e3412d4d9e9.hot-update.js",
+    "/chunks/trash.02d1b3648e3412d4d9e9.hot-update.js": "/chunks/trash.02d1b3648e3412d4d9e9.hot-update.js",
+    "/js/main.2328029a5cc4d7dc71a6.hot-update.js": "/js/main.2328029a5cc4d7dc71a6.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.2328029a5cc4d7dc71a6.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.2328029a5cc4d7dc71a6.hot-update.js",
+    "/chunks/platform.2328029a5cc4d7dc71a6.hot-update.js": "/chunks/platform.2328029a5cc4d7dc71a6.hot-update.js",
+    "/chunks/shared.2328029a5cc4d7dc71a6.hot-update.js": "/chunks/shared.2328029a5cc4d7dc71a6.hot-update.js",
+    "/chunks/shared/single-file.2328029a5cc4d7dc71a6.hot-update.js": "/chunks/shared/single-file.2328029a5cc4d7dc71a6.hot-update.js",
+    "/js/main.367a1aee0e80070beb4d.hot-update.js": "/js/main.367a1aee0e80070beb4d.hot-update.js",
+    "/chunks/shared.367a1aee0e80070beb4d.hot-update.js": "/chunks/shared.367a1aee0e80070beb4d.hot-update.js",
+    "/chunks/shared.ec775e291cbf7b428df1.hot-update.js": "/chunks/shared.ec775e291cbf7b428df1.hot-update.js",
+    "/chunks/platform.26ae43e9784a60b7b273.hot-update.js": "/chunks/platform.26ae43e9784a60b7b273.hot-update.js",
+    "/chunks/shared.8eb2ad6a3a31fa02cdc5.hot-update.js": "/chunks/shared.8eb2ad6a3a31fa02cdc5.hot-update.js",
+    "/chunks/shared/files.8eb2ad6a3a31fa02cdc5.hot-update.js": "/chunks/shared/files.8eb2ad6a3a31fa02cdc5.hot-update.js",
+    "/chunks/files.a74f924902c702d90dd5.hot-update.js": "/chunks/files.a74f924902c702d90dd5.hot-update.js",
+    "/chunks/shared/files.9cba7722ab975d162325.hot-update.js": "/chunks/shared/files.9cba7722ab975d162325.hot-update.js",
+    "/chunks/shared/files.43b9164b9e46ab667b07.hot-update.js": "/chunks/shared/files.43b9164b9e46ab667b07.hot-update.js",
+    "/chunks/shared/files.4437bb5ffc7f039bb9b8.hot-update.js": "/chunks/shared/files.4437bb5ffc7f039bb9b8.hot-update.js",
+    "/chunks/shared/files.81be3225e3f6a96dbec4.hot-update.js": "/chunks/shared/files.81be3225e3f6a96dbec4.hot-update.js",
+    "/chunks/shared/files.03472723fc935074702a.hot-update.js": "/chunks/shared/files.03472723fc935074702a.hot-update.js",
+    "/chunks/shared/files.32c8962b3e663fb0971b.hot-update.js": "/chunks/shared/files.32c8962b3e663fb0971b.hot-update.js",
+    "/chunks/shared/files.6a32e569e4e5b2cdabd7.hot-update.js": "/chunks/shared/files.6a32e569e4e5b2cdabd7.hot-update.js",
+    "/chunks/shared/files.503cee6f5a89385d5a86.hot-update.js": "/chunks/shared/files.503cee6f5a89385d5a86.hot-update.js",
+    "/chunks/shared/files.e7685e102fd5b57ee82c.hot-update.js": "/chunks/shared/files.e7685e102fd5b57ee82c.hot-update.js",
+    "/chunks/shared/files.283a83d9a59f5ae22962.hot-update.js": "/chunks/shared/files.283a83d9a59f5ae22962.hot-update.js",
+    "/chunks/shared/files.0ed7f422c4935a286b3e.hot-update.js": "/chunks/shared/files.0ed7f422c4935a286b3e.hot-update.js",
+    "/chunks/shared/files.b1e34e7d5a690efb2c1e.hot-update.js": "/chunks/shared/files.b1e34e7d5a690efb2c1e.hot-update.js",
+    "/chunks/shared/files.1fd80eb9c288345b0194.hot-update.js": "/chunks/shared/files.1fd80eb9c288345b0194.hot-update.js",
+    "/chunks/shared/files.d4a41592c1d00cd5087d.hot-update.js": "/chunks/shared/files.d4a41592c1d00cd5087d.hot-update.js",
+    "/chunks/shared/files.6bc98441897d874debe5.hot-update.js": "/chunks/shared/files.6bc98441897d874debe5.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.8c475e8320e610c4a85d.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.8c475e8320e610c4a85d.hot-update.js",
+    "/chunks/shared.8c475e8320e610c4a85d.hot-update.js": "/chunks/shared.8c475e8320e610c4a85d.hot-update.js",
+    "/chunks/shared/files.d612620139a3251492e9.hot-update.js": "/chunks/shared/files.d612620139a3251492e9.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.6018a5f80484dd4c5dac.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.6018a5f80484dd4c5dac.hot-update.js",
+    "/js/main.46d60c372fa68047d26a.hot-update.js": "/js/main.46d60c372fa68047d26a.hot-update.js",
+    "/chunks/shared/files.32edc184f9a7677daea3.hot-update.js": "/chunks/shared/files.32edc184f9a7677daea3.hot-update.js",
+    "/chunks/shared/files.05dd4949fab768f76cc0.hot-update.js": "/chunks/shared/files.05dd4949fab768f76cc0.hot-update.js",
+    "/chunks/shared/files.b5ef4db01f42b8e162da.hot-update.js": "/chunks/shared/files.b5ef4db01f42b8e162da.hot-update.js",
+    "/chunks/files.2e3849ce571831cf565d.hot-update.js": "/chunks/files.2e3849ce571831cf565d.hot-update.js",
+    "/chunks/my-shared-items.36d7e6748d57b75ef783.hot-update.js": "/chunks/my-shared-items.36d7e6748d57b75ef783.hot-update.js",
+    "/chunks/recent-uploads.ef697992b53939034b3f.hot-update.js": "/chunks/recent-uploads.ef697992b53939034b3f.hot-update.js",
+    "/chunks/trash.f391c9cc119952240b0c.hot-update.js": "/chunks/trash.f391c9cc119952240b0c.hot-update.js",
+    "/chunks/trash.89ed7fead436cba1b30a.hot-update.js": "/chunks/trash.89ed7fead436cba1b30a.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/MobileContextMenu.vue b/resources/js/components/FilesView/MobileContextMenu.vue
index 53ea89e4..02b739ba 100644
--- a/resources/js/components/FilesView/MobileContextMenu.vue
+++ b/resources/js/components/FilesView/MobileContextMenu.vue
@@ -6,11 +6,11 @@
 			<slot></slot>
         </MenuMobileGroup>
 
-		<MenuMobileGroup v-if="$slots.editor">
+		<MenuMobileGroup v-if="$slots.editor && $checkPermission('editor')">
 			<slot name="editor"></slot>
         </MenuMobileGroup>
 
-		<MenuMobileGroup v-if="$slots.visitor">
+		<MenuMobileGroup v-if="$slots.visitor && $checkPermission('visitor')">
 			<slot name="visitor"></slot>
         </MenuMobileGroup>
     </MenuMobile>
diff --git a/resources/js/components/FilesView/MultiSelectToolbar.vue b/resources/js/components/FilesView/MultiSelectToolbar.vue
index a733ffd0..af7ce3eb 100644
--- a/resources/js/components/FilesView/MultiSelectToolbar.vue
+++ b/resources/js/components/FilesView/MultiSelectToolbar.vue
@@ -2,8 +2,8 @@
     <transition name="context-menu">
         <div v-if="mobileMultiSelect" class="multiselect-actions">
 			<slot v-if="$slots.default" />
-			<slot v-if="$slots.editor" name="editor"></slot>
-			<slot v-if="$slots.visitor" name="visitor"></slot>
+			<slot v-if="$slots.editor && $checkPermission('editor')" name="editor" />
+			<slot v-if="$slots.visitor && $checkPermission('visitor')" name="visitor" />
 
             <ToolbarButton @click.native="closeSelecting" class="action-btn close-icon" source="close" :action="$t('actions.close')" />
         </div>
diff --git a/resources/js/helpers/itemHelpers.js b/resources/js/helpers/itemHelpers.js
index 8617fbe0..c055022a 100644
--- a/resources/js/helpers/itemHelpers.js
+++ b/resources/js/helpers/itemHelpers.js
@@ -28,6 +28,16 @@ const itemHelpers = {
 			})
 		}
 
+		Vue.prototype.$downloadSelection = function (item) {
+			let clipboard = this.$store.getters.clipboard
+
+			if (clipboard.length > 1 || (clipboard.length === 1 && clipboard[0].type === 'folder'))
+				this.$store.dispatch('downloadZip')
+			else {
+				Vue.prototype.$downloadFile(item.file_url, item.name + '.' + item.mimetype)
+			}
+		}
+
 		Vue.prototype.$dissolveTeamFolder = function () {
 			events.$emit('confirm:open', {
 				title: this.$t('Are you sure you want to dissolve this team?'),
diff --git a/resources/js/routes/routesShared.js b/resources/js/routes/routesShared.js
index 798ff587..11efee6b 100644
--- a/resources/js/routes/routesShared.js
+++ b/resources/js/routes/routesShared.js
@@ -12,7 +12,7 @@ const routesShared = [
 				name: 'Public',
 				path: '/share/:token/files/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/shared/files" */ '../views/FileView/Public/Public'),
+					import(/* webpackChunkName: "chunks/shared/files" */ '../views/FileView/Public'),
 				meta: {
 					requiresAuth: false
 				},
diff --git a/resources/js/routes/routesUser.js b/resources/js/routes/routesUser.js
index b0f56c33..cfd29505 100644
--- a/resources/js/routes/routesUser.js
+++ b/resources/js/routes/routesUser.js
@@ -9,7 +9,7 @@ const routesUser = [
 				name: 'Files',
 				path: '/platform/files/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Base/Files'),
+					import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Files'),
 				meta: {
 					requiresAuth: true
 				},
@@ -18,7 +18,7 @@ const routesUser = [
 				name: 'RecentUploads',
 				path: '/platform/recent-uploads',
 				component: () =>
-					import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/Base/RecentUploads'),
+					import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/RecentUploads'),
 				meta: {
 					requiresAuth: true
 				},
@@ -27,7 +27,7 @@ const routesUser = [
 				name: 'MySharedItems',
 				path: '/platform/my-shared-items',
 				component: () =>
-					import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/Base/MySharedItems'),
+					import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/MySharedItems'),
 				meta: {
 					requiresAuth: true
 				},
@@ -36,7 +36,7 @@ const routesUser = [
 				name: 'Trash',
 				path: '/platform/trash/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Base/Trash'),
+					import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Trash'),
 				meta: {
 					requiresAuth: true
 				},
@@ -45,7 +45,7 @@ const routesUser = [
 				name: 'TeamFolders',
 				path: '/platform/team-folder/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/Base/Trash'),
+					import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/Trash'),
 				meta: {
 					requiresAuth: true
 				},
@@ -54,7 +54,7 @@ const routesUser = [
 				name: 'SharedWithMe',
 				path: '/platform/shared-with-me/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/shared-with-me" */ '../views/FileView/Base/Trash'),
+					import(/* webpackChunkName: "chunks/shared-with-me" */ '../views/FileView/Trash'),
 				meta: {
 					requiresAuth: true
 				},
diff --git a/resources/js/views/FileView/NavigationPanel.vue b/resources/js/views/FileView/Components/NavigationPanel.vue
similarity index 99%
rename from resources/js/views/FileView/NavigationPanel.vue
rename to resources/js/views/FileView/Components/NavigationPanel.vue
index ac1b5e22..66d0b341 100644
--- a/resources/js/views/FileView/NavigationPanel.vue
+++ b/resources/js/views/FileView/Components/NavigationPanel.vue
@@ -101,7 +101,7 @@
 	import TreeMenuNavigator from '/resources/js/components/Others/TreeMenuNavigator'
 	import ContentSidebar from '/resources/js/components/Sidebar/ContentSidebar'
 	import ContentGroup from '/resources/js/components/Sidebar/ContentGroup'
-	import {events} from "../../bus";
+	import {events} from "../../../bus";
 	import {mapGetters} from "vuex";
 
 export default {
diff --git a/resources/js/views/FileView/NavigationSharePanel.vue b/resources/js/views/FileView/Components/NavigationSharePanel.vue
similarity index 99%
rename from resources/js/views/FileView/NavigationSharePanel.vue
rename to resources/js/views/FileView/Components/NavigationSharePanel.vue
index eb4ce942..deadf4ca 100644
--- a/resources/js/views/FileView/NavigationSharePanel.vue
+++ b/resources/js/views/FileView/Components/NavigationSharePanel.vue
@@ -27,7 +27,7 @@
 	import TreeMenuNavigator from '/resources/js/components/Others/TreeMenuNavigator'
 	import ContentSidebar from '/resources/js/components/Sidebar/ContentSidebar'
 	import ContentGroup from '/resources/js/components/Sidebar/ContentGroup'
-	import {events} from "../../bus";
+	import {events} from "../../../bus";
 	import {mapGetters} from "vuex";
 
 export default {
diff --git a/resources/js/views/FileView/Base/Files.vue b/resources/js/views/FileView/Files.vue
similarity index 88%
rename from resources/js/views/FileView/Base/Files.vue
rename to resources/js/views/FileView/Files.vue
index 87475231..b59c5dea 100644
--- a/resources/js/views/FileView/Base/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -22,7 +22,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 
@@ -35,7 +35,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</ContextMenu>
@@ -56,7 +56,7 @@
 			</OptionGroup>
 
             <OptionGroup v-if="item">
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
 		</MobileContextMenu>
 
@@ -83,10 +83,10 @@
 				<h1 class="title">
 					{{ $t('empty_page.title') }}
 				</h1>
-                <p v-if="$checkPermission(['master', 'editor'])" class="description">
+                <p class="description">
 					{{ $t('empty_page.description') }}
 				</p>
-                <ButtonUpload v-if="$checkPermission(['master', 'editor'])" button-style="theme">
+                <ButtonUpload button-style="theme">
                     {{ $t('empty_page.call_to_action') }}
                 </ButtonUpload>
 			</template>
@@ -95,7 +95,7 @@
 		<MultiSelectToolbar>
 			<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive' : clipboard.length < 1}" />
 			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
-            <ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+            <ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
 		</MultiSelectToolbar>
 	</div>
 </template>
@@ -112,7 +112,7 @@
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
 	import Option from '/resources/js/components/FilesView/Option'
 	import { mapGetters } from 'vuex'
-	import {events} from "../../../bus";
+	import {events} from "../../bus";
 
 	export default {
 		name: 'Files',
@@ -180,13 +180,6 @@
 					this.$store.dispatch('removeFromFavourites', this.item)
 				}
 			},
-			downloadItem() {
-				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
-					this.$store.dispatch('downloadZip')
-				else {
-					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
-				}
-			},
 		},
 		created() {
 			this.$store.dispatch('getFolder', this.$route.params.id)
diff --git a/resources/js/views/FileView/Base/MySharedItems.vue b/resources/js/views/FileView/MySharedItems.vue
similarity index 88%
rename from resources/js/views/FileView/Base/MySharedItems.vue
rename to resources/js/views/FileView/MySharedItems.vue
index 2159a7d4..e46dc5bc 100644
--- a/resources/js/views/FileView/Base/MySharedItems.vue
+++ b/resources/js/views/FileView/MySharedItems.vue
@@ -14,7 +14,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 
@@ -27,7 +27,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</ContextMenu>
@@ -44,7 +44,7 @@
 				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 			</OptionGroup>
 			<OptionGroup>
-				<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+				<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 			</OptionGroup>
 		</MobileContextMenu>
 
@@ -70,7 +70,7 @@
 		</FileBrowser>
 
 		<MultiSelectToolbar>
-			<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
 			<ToolbarButton @click.native="$shareCancel" class="action-btn" source="shared-off" />
 		</MultiSelectToolbar>
 	</div>
@@ -87,7 +87,7 @@
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
 	import Option from '/resources/js/components/FilesView/Option'
 	import { mapGetters } from 'vuex'
-	import {events} from "../../../bus";
+	import {events} from "../../bus";
 
 	export default {
 		name: 'MySharedItems',
@@ -153,14 +153,7 @@
 				} else {
 					this.$store.dispatch('removeFromFavourites', this.item)
 				}
-			},
-			downloadItem() {
-				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
-					this.$store.dispatch('downloadZip')
-				else {
-					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
-				}
-			},
+			}
 		},
 		created() {
 			this.$store.dispatch('getMySharedItems')
diff --git a/resources/js/views/FileView/Public/Public.vue b/resources/js/views/FileView/Public.vue
similarity index 60%
rename from resources/js/views/FileView/Public/Public.vue
rename to resources/js/views/FileView/Public.vue
index e5e343ef..ba806d01 100644
--- a/resources/js/views/FileView/Public/Public.vue
+++ b/resources/js/views/FileView/Public.vue
@@ -15,7 +15,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 
@@ -25,7 +25,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</ContextMenu>
@@ -38,60 +38,62 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 			<template v-slot:visitor>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</MobileContextMenu>
 
 		<FileBrowser>
-			<template v-slot:file-actions-mobile v-if="$checkPermission('editor')">
-				<MobileActionButton @click.native="$openSpotlight" icon="search">
-					{{ $t('actions.search') }}
-				</MobileActionButton>
-				<MobileActionButton @click.native="$createItems" icon="cloud-plus">
-					{{ $t('mobile.create') }}
-				</MobileActionButton>
-				<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
-					{{ $t('context_menu.select') }}
-				</MobileActionButton>
-				<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
-					{{ $t('preview_sorting.preview_sorting_button') }}
-				</MobileActionButton>
+			<template v-slot:file-actions-mobile>
+				<template v-if="$checkPermission('editor')">
+					<MobileActionButton @click.native="$openSpotlight" icon="search">
+						{{ $t('actions.search') }}
+					</MobileActionButton>
+					<MobileActionButton @click.native="$createItems" icon="cloud-plus">
+						{{ $t('mobile.create') }}
+					</MobileActionButton>
+					<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+						{{ $t('context_menu.select') }}
+					</MobileActionButton>
+					<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+						{{ $t('preview_sorting.preview_sorting_button') }}
+					</MobileActionButton>
+				</template>
+				<template v-if="$checkPermission('visitor')">
+					<MobileActionButton @click.native="$openSpotlight" icon="search">
+						{{ $t('actions.search')}}
+					</MobileActionButton>
+					 <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					   {{ $t('context_menu.select') }}
+					</MobileActionButton>
+					 <MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+						{{ $t('preview_sorting.preview_sorting_button') }}
+					</MobileActionButton>
+				</template>
 			</template>
 
-			<template v-slot:file-actions-mobile v-if="$checkPermission('visitor')">
-				<MobileActionButton @click.native="$openSpotlight" icon="search">
-					{{ $t('actions.search')}}
-				</MobileActionButton>
-				 <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
-				   {{ $t('context_menu.select') }}
-				</MobileActionButton>
-				 <MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
-					{{ $t('preview_sorting.preview_sorting_button') }}
-				</MobileActionButton>
-			</template>
-
-			<template v-slot:empty-file-page v-if="$checkPermission('editor')">
-				<h1 class="title">
-					{{ $t('empty_page.title') }}
-				</h1>
-                <p class="description">
-					{{ $t('empty_page.description') }}
-				</p>
-                <ButtonUpload button-style="theme">
-                    {{ $t('empty_page.call_to_action') }}
-                </ButtonUpload>
-			</template>
-
-			<template v-slot:empty-file-page v-if="$checkPermission('visitor')">
-				<h1 class="title">
-					{{ $t('empty_page.title') }}
-				</h1>
+			<template v-slot:empty-file-page>
+				<template v-if="$checkPermission('editor')">
+					<h1 class="title">
+						{{ $t('empty_page.title') }}
+					</h1>
+					<p class="description">
+						{{ $t('empty_page.description') }}
+					</p>
+					<ButtonUpload button-style="theme">
+						{{ $t('empty_page.call_to_action') }}
+					</ButtonUpload>
+				</template>
+				<template v-if="$checkPermission('visitor')">
+					<h1 class="title">
+						{{ $t('empty_page.title') }}
+					</h1>
+				</template>
 			</template>
 		</FileBrowser>
 
@@ -99,9 +101,8 @@
 			<template v-slot:visitor>
 				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
 			</template>
-
 			<template v-slot:editor>
-				<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive' : clipboard.length < 1}" />
+				<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive': clipboard.length < 1}" />
 				<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive': clipboard.length < 1}" :action="$t('actions.delete')" />
 				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
 			</template>
@@ -119,7 +120,7 @@
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
 	import Option from '/resources/js/components/FilesView/Option'
-	import {events} from "../../../bus"
+	import {events} from "../../bus"
 	import { mapGetters } from 'vuex'
 
 	export default {
@@ -137,31 +138,14 @@
 		},
 		computed: {
 			...mapGetters([
-				'sharedDetail',
 				'clipboard',
-				'user',
-			]),
-			isFolder() {
-				return this.item && this.item.type === 'folder'
-			},
-			hasFile() {
-				return this.clipboard.find(item => item.type !== 'folder')
-			}
+			])
 		},
 		data() {
 			return {
 				item: undefined,
 			}
 		},
-		methods: {
-			downloadItem() {
-				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
-					this.$store.dispatch('downloadZip')
-				else {
-					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
-				}
-			},
-		},
 		created() {
 			this.$store.dispatch('getSharedFolder', this.$route.params.id)
 
diff --git a/resources/js/views/FileView/Base/RecentUploads.vue b/resources/js/views/FileView/RecentUploads.vue
similarity index 85%
rename from resources/js/views/FileView/Base/RecentUploads.vue
rename to resources/js/views/FileView/RecentUploads.vue
index 115ddac2..331b9558 100644
--- a/resources/js/views/FileView/Base/RecentUploads.vue
+++ b/resources/js/views/FileView/RecentUploads.vue
@@ -12,7 +12,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 
@@ -22,7 +22,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</ContextMenu>
@@ -35,7 +35,7 @@
 				<Option @click.native="$shareFileOrFolder(item)" :title="item && item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 			</OptionGroup>
 			<OptionGroup>
-				<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+				<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 			</OptionGroup>
 		</MobileContextMenu>
 
@@ -61,7 +61,7 @@
 
 		<MultiSelectToolbar>
 			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
-			<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
 		</MultiSelectToolbar>
 	</div>
 </template>
@@ -77,7 +77,7 @@
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
 	import Option from '/resources/js/components/FilesView/Option'
 	import { mapGetters } from 'vuex'
-	import {events} from "../../../bus";
+	import {events} from "../../bus";
 
 	export default {
 		name: 'RecentUploads',
@@ -112,15 +112,6 @@
 				item: undefined,
 			}
 		},
-		methods: {
-			downloadItem() {
-				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
-					this.$store.dispatch('downloadZip')
-				else {
-					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
-				}
-			},
-		},
 		created() {
 			this.$store.dispatch('getRecentUploads')
 
diff --git a/resources/js/views/FileView/Base/Trash.vue b/resources/js/views/FileView/Trash.vue
similarity index 85%
rename from resources/js/views/FileView/Base/Trash.vue
rename to resources/js/views/FileView/Trash.vue
index cae40703..31b72e37 100644
--- a/resources/js/views/FileView/Base/Trash.vue
+++ b/resources/js/views/FileView/Trash.vue
@@ -15,7 +15,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 
@@ -26,7 +26,7 @@
 					<Option @click.native="$emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
 				</OptionGroup>
 			</template>
 		</ContextMenu>
@@ -38,7 +38,7 @@
             </OptionGroup>
 
             <OptionGroup>
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
 		</MobileContextMenu>
 
@@ -68,7 +68,7 @@
 
 		<MultiSelectToolbar>
 			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
-			<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
 		</MultiSelectToolbar>
 	</div>
 </template>
@@ -84,7 +84,7 @@
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
 	import Option from '/resources/js/components/FilesView/Option'
 	import { mapGetters } from 'vuex'
-	import {events} from "../../../bus";
+	import {events} from "../../bus";
 
 	export default {
 		name: 'Trash',
@@ -118,15 +118,6 @@
 				item: undefined,
 			}
 		},
-		methods: {
-			downloadItem() {
-				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
-					this.$store.dispatch('downloadZip')
-				else {
-					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
-				}
-			},
-		},
 		created() {
 			this.$store.dispatch('getTrash', this.$route.params.id)
 
diff --git a/resources/js/views/Platform.vue b/resources/js/views/Platform.vue
index 492512c6..a4196e75 100644
--- a/resources/js/views/Platform.vue
+++ b/resources/js/views/Platform.vue
@@ -16,7 +16,6 @@
 
         <CreateFolderPopup />
         <RenameItemPopup />
-
         <MoveItemPopup />
 
         <!--Mobile components-->
@@ -60,7 +59,7 @@
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
     import Spotlight from '/resources/js/components/Spotlight/Spotlight'
     import DragUI from '/resources/js/components/FilesView/DragUI'
-	import NavigationPanel from "./FileView/NavigationPanel"
+	import NavigationPanel from "./FileView/Components/NavigationPanel"
     import {events} from '/resources/js/bus'
 
     export default {
diff --git a/resources/js/views/Shared.vue b/resources/js/views/Shared.vue
index 45767fb0..6abc7d88 100644
--- a/resources/js/views/Shared.vue
+++ b/resources/js/views/Shared.vue
@@ -6,19 +6,17 @@
 
         <!--File preview window-->
         <FilePreview />
+		<Spotlight />
 
         <!--Popups-->
         <ProcessingPopup />
 
         <CreateFolderPopup />
         <RenameItemPopup />
-
         <MoveItemPopup />
 
         <!-- Mobile components -->
         <FileSortingMobile />
-        <MobileContextMenu />
-
         <MultiSelectToolbar />
 
         <!--Others-->
@@ -37,19 +35,19 @@
 
 <script>
     import MultiSelectToolbar from '/resources/js/components/FilesView/MultiSelectToolbar'
-    import MobileContextMenu from '/resources/js/components/FilesView/MobileContextMenu'
     import FileSortingMobile from '/resources/js/components/FilesView/FileSortingMobile'
     import CreateFolderPopup from '/resources/js/components/Others/CreateFolderPopup'
     import ProcessingPopup from '/resources/js/components/FilesView/ProcessingPopup'
+	import NavigationSharePanel from "./FileView/Components/NavigationSharePanel"
     import RenameItemPopup from '/resources/js/components/Others/RenameItemPopup'
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
     import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
 	import DesktopToolbar from "../components/FilesView/DesktopToolbar"
-	import NavigationSharePanel from "./FileView/NavigationSharePanel"
     import Spinner from '/resources/js/components/FilesView/Spinner'
     import Vignette from '/resources/js/components/Others/Vignette'
     import DragUI from '/resources/js/components/FilesView/DragUI'
     import Alert from '/resources/js/components/FilesView/Alert'
+	import Spotlight from "../components/Spotlight/Spotlight"
     import {events} from '/resources/js/bus'
     import {mapGetters} from 'vuex'
 
@@ -60,12 +58,12 @@
             MultiSelectToolbar,
             CreateFolderPopup,
             FileSortingMobile,
-            MobileContextMenu,
             ProcessingPopup,
             RenameItemPopup,
 			DesktopToolbar,
             MoveItemPopup,
             FilePreview,
+			Spotlight,
             Vignette,
             Spinner,
             DragUI,