diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 32443599..4ee51ae8 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,65 +1,112 @@
 {
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=799ad2ed041d3da8fcd9",
-    "/js/main.js": "/js/main.js?id=3033720c430ded44dec5",
-    "/css/app.css": "/css/app.css?id=8f6d5dcb7110a726e142",
-    "/chunks/admin.js": "/chunks/admin.js?id=60df31e17e9a453717dc",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=ab97f01586b286e0bba2",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=cbcbdb5159db1fdef0fe",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=2a85f4c8ad09b50f4358",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=49806a5c914ca1a14bff",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=ff6fb3cb1780d6ea76f2",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=ebc9676ed26d701a599c",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=ad822a37d1d7c6e99a08",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=e23a68dba034c047ff44",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c1c6fcc091a248b10060",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=0e1d52490ae1b9e56c74",
-    "/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=9363c50bf358b03b14fc",
-    "/chunks/database.js": "/chunks/database.js?id=45630822140f0f9d8fb5",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=08a0c2de8f93e0222600",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=be1c6cf5bbedf5c987da",
-    "/chunks/files.js": "/chunks/files.js?id=e182df6a47e8764f428a",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7ff98232e7b4cc5d2c2a",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=d6ff4604fd61fd8a081d",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=8ee2335b0707f188c814",
-    "/chunks/landing-page.js": "/chunks/landing-page.js?id=9b500c8f5f2de6ae01b3",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=53d4f9c58bdac1e568c7",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=682b2836ee0726d72409",
-    "/chunks/pages.js": "/chunks/pages.js?id=bda0c9cefb903ba14491",
-    "/chunks/plan.js": "/chunks/plan.js?id=d679b2c4e3dafe7cb4de",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=921149e0082c663f0ce8",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=daff73302efdfacc542a",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=3047e82dffef9a9a5f36",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=d46857048beab30edb45",
-    "/chunks/plans.js": "/chunks/plans.js?id=79272450ebbe84a688b2",
-    "/chunks/profile.js": "/chunks/profile.js?id=a71f52eb082c5173b37e",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=7ef575dcdf8d8cce1781",
-    "/chunks/settings.js": "/chunks/settings.js?id=e92a372ac6714092f999",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=8e425a5fcac0dfed8979",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=124785707d6d7eefc088",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=f7b86ce4daef5d65b9c7",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=c7454053654e1b5670ce",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=d74048cf27bfd83ecacb",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=754550f7d1abe0678d00",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=adbeabe4eee0cdaefbf4",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=691e43731207990aeef3",
-    "/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=1855b3385d413077987b",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=8f7dd3b0a9efd8b23cb6",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=5d6baf6541a2045e07d4",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=5b8044541a28db10a800",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a7aac734e0697c974314",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=b5d285ace19d55d6caba",
-    "/chunks/user.js": "/chunks/user.js?id=a22678762221f8ece00f",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=d2c5a7a23e892ea0b74f",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=97382205d44cc82a7362",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=368fa9dff628423894ea",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=25a90c334e0edcf8497a",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=66ca2fe7b5f27aea03b4",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=1197c179b53abd596800",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=df85e3892af3ff39a586",
-    "/chunks/users.js": "/chunks/users.js?id=168da140d2da438f8d93"
+    "/js/main.js": "/js/main.js",
+    "/css/app.css": "/css/app.css",
+    "/chunks/admin.js": "/chunks/admin.js?id=5807ec412746448047f9",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=d820e99a25f40cc97570",
+    "/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=1ad1b7b56512338223eb",
+    "/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=6c02fe91a2e167b63a98",
+    "/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=312acc0ff7daa010eea5",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=03e587de7dd10fba3ead",
+    "/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=fd3c7242b5c765b469e4",
+    "/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=ebb1b6ed1df237b56cd9",
+    "/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=a8bd98f9f181d9ee68fd",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=2b87899e656ed382d260",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=2e5a1b525d335367cfc1",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=05747ca2c86a1daea9cd",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=55e1ec30bdca87c1adef",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=796c7c2cfb9c6c39c8a7",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=b85ce942737e25c37b8a",
+    "/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=99eb5ed6af46738c97e0",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=78bbf0b2065cf270dbe6",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=573e29a00589cb5d3489",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=7ded3c3e9668eea6c15c",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=96ac1ede73f3fc9afa37",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=278eef02eace89698f20",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=62896779642616a310ca",
+    "/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=ec6fdf1d9f2a839f31cf",
+    "/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=d7795f20187163939276",
+    "/chunks/database.js": "/chunks/database.js?id=c7aa7caa9126b1ecdffa",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=86093752b39920044fda",
+    "/chunks/files.js": "/chunks/files.js?id=dec50700cb69d226f79d",
+    "/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=e285e842f58178d681c4",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=a4cde4f0838e7f06ac53",
+    "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=825fdc29b64056380220",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=8a5dfc3d2d07db1102db",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=2352574bc22e5e3f7dac",
+    "/chunks/landing-page.js": "/chunks/landing-page.js?id=dabf50b10edb2ae2f388",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=6666b81edc5ff6f60e82",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=f7e24a5841604313332a",
+    "/chunks/pages.js": "/chunks/pages.js?id=7ec1c496031ff8478b51",
+    "/chunks/plan.js": "/chunks/plan.js?id=cc041fb9c2cb9ad8f0ff",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=a66d8ae3a6edd08b755b",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=0732885b6e0839afe66e",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=445ca1affcefaf37cbfc",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8372954a6c160302859d",
+    "/chunks/plans.js": "/chunks/plans.js?id=0941e8c0e85e81162cc8",
+    "/chunks/profile.js": "/chunks/profile.js?id=b91a5757f57bdaee120d",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a44394b1fa09f996a9fd",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8c92667fa59dc9fd7ac7",
+    "/chunks/settings.js": "/chunks/settings.js?id=0be829a409b9cbcb9bfc",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=25225a758b04d6d48617",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=c7499d2d79bf9620dfa5",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=015ead5623aee1a543cf",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=1810248d2c5931651314",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=013b6f15f907caaecd1e",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=6172a89afe3b27cb76cd",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=1860b9031f41ed46d0e0",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=e1ec047f428e84866150",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=ddb0ae9561462e691ce3",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=be89f6dcf7372d23668f",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=0e09f1509a73646c3198",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=7a4e1ba1d08b0bb37453",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=f672876adcf877e6e126",
+    "/chunks/upgrade.js": "/chunks/upgrade.js?id=1c94ed3f8c2c366f730b",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=638ac716c4995894563c",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=7e805915ede7c330c6d1",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=ecc3c773b7c8ff422cf7",
+    "/chunks/user.js": "/chunks/user.js?id=1e0f9c8cab76e5ef871f",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=fb808e071ab049b55490",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=9c7eb4dab2be288cb884",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=43545e2d110b40a47756",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=b05dcb7e7ad2f4959e52",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=57fe622e9a03e834d6fa",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=76465e9a36a2ab78eff3",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e9528debb38dc1654cef",
+    "/chunks/users.js": "/chunks/users.js?id=78680d85246eba5b175f",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.26f61afe093cfc6fcc31.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.26f61afe093cfc6fcc31.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.0409f2be9b8fae48bc0e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0409f2be9b8fae48bc0e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.561868279bd6362106a2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.561868279bd6362106a2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.1be4f3619f322e69050e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1be4f3619f322e69050e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.91a3c224897022b44c26.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.91a3c224897022b44c26.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.fb777acf4b5b41782634.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.fb777acf4b5b41782634.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.3044bf028fed1d232f3d.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.3044bf028fed1d232f3d.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.0fa6b04eb4652f65bf33.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.0fa6b04eb4652f65bf33.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9a85b6d86883a1475d80.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9a85b6d86883a1475d80.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9a85b6d86883a1475d80.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9a85b6d86883a1475d80.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.96218d2892c934980486.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.96218d2892c934980486.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.ab4aa9a7e19be158baa1.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.ab4aa9a7e19be158baa1.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6faedac422d55e0d5a3a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6faedac422d55e0d5a3a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.25d0c9fb4cfa80b2e0e0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.25d0c9fb4cfa80b2e0e0.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9d6e6d48e5fde10bf744.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9d6e6d48e5fde10bf744.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8cf6480d4b16f5c0f0bb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8cf6480d4b16f5c0f0bb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e9bc118c3127867bf288.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e9bc118c3127867bf288.hot-update.js",
+    "/js/main.1dc13e9d35f240fe8b07.hot-update.js": "/js/main.1dc13e9d35f240fe8b07.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.cbf266dd26e828f26721.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cbf266dd26e828f26721.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fbf55581bf870999da6d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fbf55581bf870999da6d.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.bff4bfd4000101d0e52d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.bff4bfd4000101d0e52d.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.af0a74a904a148ad3a0a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.af0a74a904a148ad3a0a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6ef07d0614cf18c4740d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6ef07d0614cf18c4740d.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.a3adb5cf5abc84dd347a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a3adb5cf5abc84dd347a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.a241881e613a00d90f28.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a241881e613a00d90f28.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.c55bd6bed8021bdc84c3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c55bd6bed8021bdc84c3.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6dedb3a5397bd91ac1a8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6dedb3a5397bd91ac1a8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8ed3ae2f8e45a4c8304e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8ed3ae2f8e45a4c8304e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.3db4d8afe5133dcfb01f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3db4d8afe5133dcfb01f.hot-update.js",
+    "/js/main.c887c39d7a54feb6ce81.hot-update.js": "/js/main.c887c39d7a54feb6ce81.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e8c7e6f6ea6610b10001.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e8c7e6f6ea6610b10001.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9b617eb9e09fb967a4b0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9b617eb9e09fb967a4b0.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fe10bd623384781e7c23.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fe10bd623384781e7c23.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index c8d13f9a..3c3b72fd 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -3,22 +3,18 @@
 
         <!-- File Preview -->
         <div class="menu-options" id="menu-list" v-if="showFromPreview">
-
             <OptionGroup class="menu-option-group">
                 <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
                 <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item"/>
-                <Option @click.native="shareItem" v-if="$checkPermission('master')"
-                        :title="item.shared
+                <Option @click.native="shareItem" v-if="$checkPermission('master')" :title="item.shared
                             ? $t('context_menu.share_edit')
-                            : $t('context_menu.share')" 
-                        icon="share"/>
+                            : $t('context_menu.share')" icon="share"/>
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" class="menu-option"/>
             </OptionGroup>
 
-            <OptionGroup >
+            <OptionGroup>
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
-
         </div>
 
         <!-- Trash location-->
@@ -27,7 +23,7 @@
             <!-- Single options -->
             <OptionGroup v-if="multiSelectContextMenu">
                 <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
                 <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash"/>
             </OptionGroup>
 
@@ -38,15 +34,13 @@
 
             <!-- Multi options -->
             <OptionGroup v-if="!multiSelectContextMenu">
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
                 <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
                 <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
-
-
         </div>
 
         <!-- Shared location with MASTER permission-->
@@ -54,71 +48,61 @@
 
             <!-- Single options -->
             <OptionGroup class="menu-option-group" v-if="item && isFolder && multiSelectContextMenu">
-                <Option @click.native="addToFavourites"
-                        :title=" isInFavourites
+                <Option @click.native="addToFavourites" :title=" isInFavourites
                         ? $t('context_menu.remove_from_favourites')
-                        : $t('context_menu.add_to_favourites')" 
-                        icon="favourites"/>
+                        : $t('context_menu.add_to_favourites')" icon="favourites"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && multiSelectContextMenu">
                 <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
-                <Option @click.native="shareItem" :title=" item.shared ? $t('context_menu.share_edit'): $t('context_menu.share')"
-                                                                         icon="share"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="shareItem" :title=" item.shared ? $t('context_menu.share_edit'): $t('context_menu.share')" icon="share"/>
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
 
             <!-- Multi options -->
             <OptionGroup class="menu-option-group" v-if="item && !hasFile && !multiSelectContextMenu">
-                <Option @click.native="addToFavourites"
-                        :title=" isInFavourites
+                <Option @click.native="addToFavourites" :title=" isInFavourites
                                 ? $t('context_menu.remove_from_favourites')
-                                : $t('context_menu.add_to_favourites')" 
-                        icon="favourites"/>
+                                : $t('context_menu.add_to_favourites')" icon="favourites"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && !multiSelectContextMenu">
-                <Option @click.native="shareCancel" :title="$t('context_menu.share_cancel')" icon="share" />
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="shareCancel" :title="$t('context_menu.share_cancel')" icon="share"/>
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
             </OptionGroup>
 
             <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
                 <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
-            
         </div>
-                   
-                    
 
         <!-- Base location with MASTER permission-->
         <div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
-            
+
             <!-- Single options -->
             <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && multiSelectContextMenu">
-                <Option @click.native="addToFavourites" v-if="item && isFolder " :title=" isInFavourites
+                <Option @click.native="addToFavourites" v-if="item && isFolder " :title="isInFavourites
                                                                                 ? $t('context_menu.remove_from_favourites')
-                                                                                : $t('context_menu.add_to_favourites')" 
-                                                                                icon="favourites"/>
-                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
+                                                                                : $t('context_menu.add_to_favourites')" icon="favourites"/>
+                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder"/>
             </OptionGroup>
-                
-                  
+
+
             <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
+                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
                 <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item"/>
-                <Option @click.native="shareItem" :title=" item.shared
+                <Option @click.native="shareItem" :title="item.shared
                                                             ? $t('context_menu.share_edit')
-                                                            : $t('context_menu.share')"
-                                                            icon="share"/>
+                                                            : $t('context_menu.share')" icon="share"/>
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
             </OptionGroup>
-                   
-                    
+
+
             <OptionGroup v-if="item && multiSelectContextMenu ">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
@@ -128,22 +112,18 @@
             <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !multiSelectContextMenu">
                 <Option @click.native="addToFavourites" v-if="item && !hasFile" :title=" isInFavourites
                                                                                     ? $t('context_menu.remove_from_favourites')
-                                                                                    : $t('context_menu.add_to_favourites')" 
-                                                                                icon="favourites"/>
-                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
+                                                                                    : $t('context_menu.add_to_favourites')" icon="favourites"/>
+                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder"/>
             </OptionGroup>
-                
-                  
+
             <OptionGroup v-if="item && !multiSelectContextMenu">
                 <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item"/>
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
             </OptionGroup>
-                   
-                    
+
             <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
                 <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
-
         </div>
 
         <!-- Base & Public location with EDITOR permission-->
@@ -162,7 +142,7 @@
 
             <OptionGroup v-if="item && multiSelectContextMenu">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
 
             <!-- Multi options -->
@@ -176,9 +156,8 @@
             </OptionGroup>
 
             <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
-                <Option @click.native="downloadItem"  :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
             </OptionGroup>
-
         </div>
 
         <!-- Base & Public location with VISITOR permission-->
@@ -191,7 +170,7 @@
             </OptionGroup>
 
             <!-- Multi options -->
-             <OptionGroup v-if="!multiSelectContextMenu && item ">
+            <OptionGroup v-if="!multiSelectContextMenu && item ">
                 <Option @click.native="downloadItem" v-if="!hasFolder" :title="$t('context_menu.download')" icon="download"/>
                 <Option v-if="hasFolder" :title="$t('context_menu.no_options')" icon="no-options" class="no-options"/>
             </OptionGroup>
@@ -210,34 +189,34 @@ export default {
     name: 'ContextMenu',
     components: {
         OptionGroup,
-        Option,
+        Option
     },
     computed: {
         ...mapGetters(['user', 'fileInfoDetail']),
-        hasFolder(){
+        hasFolder() {
 
             // Check if selected items includes some folder
-            if(this.fileInfoDetail.find(item => item.type === 'folder'))
+            if (this.fileInfoDetail.find(item => item.type === 'folder'))
                 return true
 
         },
-        hasFile(){
+        hasFile() {
 
             // Check if selected items includes some files
-             if(this.fileInfoDetail.find(item => item.type !== 'folder'))
+            if (this.fileInfoDetail.find(item => item.type !== 'folder'))
                 return true
 
         },
         multiSelectContextMenu() {
 
             // If is context Menu open on multi selected items open just options for the multi selected items
-            if (this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.item)) 
+            if (this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.item))
                 return false
-            
+
             // If is context Menu open for the non selected item open options for the single item
-            if (this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.item)) 
+            if (this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.item))
                 return true
-            
+
         },
         favourites() {
             return this.user.relationships.favourites.data.attributes.folders
@@ -271,10 +250,10 @@ export default {
     },
 
     methods: {
-        emptyTrash(){
+        emptyTrash() {
             this.$store.dispatch('emptyTrash')
         },
-        restoreItem(){
+        restoreItem() {
             this.$store.dispatch('restoreItem', this.item)
         },
         shareCancel() {
@@ -458,14 +437,16 @@ export default {
     /deep/ .text-label {
         color: $text-muted !important;
     }
+
     /deep/ &:hover {
         background: transparent;
     }
-        /deep/ path,
-        /deep/line,
-        /deep/circle {
-            stroke: $text-muted !important;
-        }
+
+    /deep/ path,
+    /deep/ line,
+    /deep/ circle {
+        stroke: $text-muted !important;
+    }
 }
 
 .filePreviewFixed {
@@ -499,17 +480,19 @@ export default {
         background: $dark_mode_foreground;
     }
     .no-options {
-    /deep/ .text-label {
-        color: $dark_mode_text_secondary !important;
-    }
-    /deep/ &:hover {
-        background: transparent;
-    }
+        /deep/ .text-label {
+            color: $dark_mode_text_secondary !important;
+        }
+
+        /deep/ &:hover {
+            background: transparent;
+        }
+
         /deep/ path,
-        /deep/line,
-        /deep/circle {
+        /deep/ line,
+        /deep/ circle {
             stroke: $dark_mode_text_secondary !important;
         }
-}
+    }
 }
 </style>
diff --git a/resources/js/components/FilesView/MobileActionButton.vue b/resources/js/components/FilesView/MobileActionButton.vue
index afc60503..e92d8633 100644
--- a/resources/js/components/FilesView/MobileActionButton.vue
+++ b/resources/js/components/FilesView/MobileActionButton.vue
@@ -8,6 +8,9 @@
             <grid-icon v-if="icon === 'th'" size="15" class="icon"></grid-icon>
             <user-plus-icon v-if="icon === 'user-plus'" size="15" class="icon"></user-plus-icon>
             <plus-icon v-if="icon === 'plus'" size="15" class="icon"></plus-icon>
+            <check-square-icon v-if="icon === 'check-square'" size="15" class="icon"></check-square-icon>
+            <x-square-icon v-if="icon === 'x-square'" size="15" class="icon"></x-square-icon>
+            <check-icon v-if="icon === 'check'" size="15" class="icon"></check-icon>
             <svg v-if="icon === 'preview-sorting'" size="15" class="icon preview-sorting"
                 width="15px" height="15px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                 <g id="VueFileManager" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
@@ -34,7 +37,7 @@
 </template>
 
 <script>
-    import { FolderPlusIcon, ListIcon, GridIcon, TrashIcon, UserPlusIcon, PlusIcon, CreditCardIcon } from 'vue-feather-icons'
+    import { CheckIcon, XSquareIcon, CheckSquareIcon, FolderPlusIcon, ListIcon, GridIcon, TrashIcon, UserPlusIcon, PlusIcon, CreditCardIcon } from 'vue-feather-icons'
 
     export default {
         name: 'MobileActionButton',
@@ -42,9 +45,12 @@
             'icon'
         ],
         components: {
+            CheckSquareIcon,
             CreditCardIcon,
             FolderPlusIcon,
             UserPlusIcon,
+            XSquareIcon,
+            CheckIcon,
             TrashIcon,
             PlusIcon,
             ListIcon,
diff --git a/resources/js/components/FilesView/MobileActions.vue b/resources/js/components/FilesView/MobileActions.vue
index c89f9a77..c05303f2 100644
--- a/resources/js/components/FilesView/MobileActions.vue
+++ b/resources/js/components/FilesView/MobileActions.vue
@@ -2,40 +2,53 @@
     <div id="mobile-actions-wrapper">
 
         <!--Actions for trash location with MASTER permission--->
-        <div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master')" class="mobile-actions">
+        <div v-if="trashLocationMenu" class="mobile-actions">
             <MobileActionButton @click.native="$store.dispatch('emptyTrash')" icon="trash">
                 {{ $t('context_menu.empty_trash') }}
             </MobileActionButton>
-             <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
+             <MobileMultiSelectButton @click.native="enableMultiSelectMode">
                 {{ $t('context_menu.select') }}
             </MobileMultiSelectButton>
-             <MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
+             <MobileActionButton class="preview-sorting" @click.native="showViewOptions" icon="preview-sorting">
                 {{$t('preview_sorting.preview_sorting_button')}}
             </MobileActionButton>
         </div>
 
         <!--ContextMenu for Base location with MASTER permission-->
-        <div v-if="$isThisLocation(['base', 'public']) && $checkPermission(['master', 'editor'])" class="mobile-actions">
-            <MobileActionButton @click.native="createFolder" icon="folder-plus" :class="{'is-inactive' : mobileMultiSelect}">
-                {{ $t('context_menu.add_folder') }}
-            </MobileActionButton>
-            <MobileActionButtonUpload :class="{'is-inactive' : mobileMultiSelect}">
-                {{ $t('context_menu.upload') }}
-            </MobileActionButtonUpload>
-            <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
-               {{ $t('context_menu.select') }}
-            </MobileMultiSelectButton>
-            <MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
-                {{$t('preview_sorting.preview_sorting_button')}}
-            </MobileActionButton>
+        <div v-if="baseLocationMasterMenu" class="mobile-actions">
+            <div v-if="! multiSelectMode">
+                <MobileActionButton @click.native="createFolder" icon="folder-plus" :class="{'is-inactive' : multiSelectMode}">
+                    {{ $t('context_menu.add_folder') }}
+                </MobileActionButton>
+                <MobileActionButtonUpload :class="{'is-inactive' : multiSelectMode}">
+                    {{ $t('context_menu.upload') }}
+                </MobileActionButtonUpload>
+                <MobileMultiSelectButton @click.native="enableMultiSelectMode">
+                   {{ $t('context_menu.select') }}
+                </MobileMultiSelectButton>
+                <MobileActionButton class="preview-sorting" @click.native="showViewOptions" icon="preview-sorting">
+                    {{$t('preview_sorting.preview_sorting_button')}}
+                </MobileActionButton>
+            </div>
+            <div v-if="multiSelectMode">
+                <MobileActionButton @click.native="selectAll" icon="check-square">
+                    Select All
+                </MobileActionButton>
+                <MobileActionButton @click.native="deselectAll" icon="x-square">
+                    Deselect All
+                </MobileActionButton>
+                <MobileActionButton @click.native="disableMultiSelectMode" icon="check">
+                    Done
+                </MobileActionButton>
+            </div>
         </div>
 
         <!--ContextMenu for Base location with VISITOR permission-->
-        <div v-if="($isThisLocation(['base', 'shared', 'public']) && $checkPermission('visitor')) || ($isThisLocation(['latest', 'shared']) && $checkPermission('master'))" class="mobile-actions">
-             <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
+        <div v-if="baseLocationVisitorMenu" class="mobile-actions">
+             <MobileMultiSelectButton @click.native="enableMultiSelectMode">
                {{ $t('context_menu.select') }}
             </MobileMultiSelectButton>
-             <MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
+             <MobileActionButton class="preview-sorting" @click.native="showViewOptions" icon="preview-sorting">
                 {{$t('preview_sorting.preview_sorting_button')}}
             </MobileActionButton>
         </div>
@@ -51,7 +64,6 @@
     import MobileActionButton from '@/components/FilesView/MobileActionButton'
     import UploadProgress from '@/components/FilesView/UploadProgress'
     import {mapGetters} from 'vuex'
-    import {debounce} from 'lodash'
     import {events} from '@/bus'
 
     export default {
@@ -67,51 +79,54 @@
             previewIcon() {
                 return this.FilePreviewType === 'list' ? 'th' : 'th-list'
             },
+            trashLocationMenu() {
+                return this.$isThisLocation(['trash', 'trash-root']) && this.$checkPermission('master')
+            },
+            baseLocationMasterMenu() {
+                return this.$isThisLocation(['base', 'public']) && this.$checkPermission(['master', 'editor'])
+            },
+            baseLocationVisitorMenu() {
+                return (this.$isThisLocation(['base', 'shared', 'public']) && this.$checkPermission('visitor')) || (this.$isThisLocation(['latest', 'shared']) && this.$checkPermission('master'))
+            },
         },
         data () {
             return {
-                mobileMultiSelect: false,
+                multiSelectMode: false,
+                mobileSortingAndPreview: false,
                 turnOff:false,
-                mobileSortingAndPreview: false
-            }
-        },
-        watch: {
-            mobileMultiSelect () {
-                
-                if(this.mobileMultiSelect ) {
-                    events.$emit('mobileSelecting:start')
-                }
-                if(!this.mobileMultiSelect) {
-                    events.$emit('mobileSelecting:stop')
-                }
-            },
-            mobileSortingAndPreview () {
-                // TODO: co to
-                if(this.mobileSortingAndPreview) {
-                    events.$emit('mobileSortingAndPreview' , true)
-                    events.$emit('mobileSortingAndPreviewVignette' , true)
-                    this.mobileMultiSelect = false
-                }
-
-                if(!this.mobileSortingAndPreview) {
-                    events.$emit('mobileSortingAndPreview', false)
-                    events.$emit('mobileSortingAndPreviewVignette' , false)
-                }
             }
         },
         methods: {
+            selectAll() {
+
+            },
+            deselectAll() {
+
+            },
+            enableMultiSelectMode() {
+                this.multiSelectMode = true
+
+                events.$emit('mobileSelecting:start')
+            },
+            disableMultiSelectMode() {
+                this.multiSelectMode = false
+
+                events.$emit('mobileSelecting:stop')
+            },
+            showViewOptions() {
+                this.mobileSortingAndPreview = ! this.mobileSortingAndPreview
+
+                // Toggle mobile sorting
+                events.$emit('mobileSortingAndPreview', this.mobileSortingAndPreview)
+                events.$emit('mobileSortingAndPreviewVignette', this.mobileSortingAndPreview)
+            },
             createFolder() {
                 events.$emit('popup:open', {name: 'create-folder'})
             },
         },
         mounted () {
-                events.$on('mobileSelecting:stop', () => {
-                    this.mobileMultiSelect = false
-                }) 
-
-                events.$on('mobileSortingAndPreview', (state) => {
-                    this.mobileSortingAndPreview = state
-                })
+                events.$on('mobileSelecting:stop', () => this.multiSelectMode = false)
+                events.$on('mobileSortingAndPreview', state => this.mobileSortingAndPreview = state)
         }
     }
 </script>
@@ -148,10 +163,10 @@
     }
 
     .mobile-actions {
-        padding-top: 10px;
-        padding-bottom: 10px;
         white-space: nowrap;
         overflow-x: auto;
+        margin: 0 -15px;
+        padding: 10px 0 10px 15px;
     }
 
     @media only screen and (max-width: 960px) {
diff --git a/resources/js/components/FilesView/MobileMultiSelectMenu.vue b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
index 21eab692..709aef99 100644
--- a/resources/js/components/FilesView/MobileMultiSelectMenu.vue
+++ b/resources/js/components/FilesView/MobileMultiSelectMenu.vue
@@ -90,7 +90,7 @@ export default {
     background: white;
 
     .action-btn {
-        margin-right: 15px;
+        margin-right: 25px;
 
         &:last-child {
             margin-right: 0;
diff --git a/resources/js/components/FilesView/SortingAndPreviewMenu.vue b/resources/js/components/FilesView/SortingAndPreviewMenu.vue
index d18b380c..c77e3051 100644
--- a/resources/js/components/FilesView/SortingAndPreviewMenu.vue
+++ b/resources/js/components/FilesView/SortingAndPreviewMenu.vue
@@ -107,6 +107,7 @@ export default {
 
             if (this.$isMobile())
                 events.$emit('mobileSortingAndPreview', false)
+                events.$emit('mobileSortingAndPreviewVignette', this.mobileSortingAndPreview)
         }
     },
     mounted() {