diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 2a617755..cafa35aa 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -22,28 +22,28 @@
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=be7eb0498b786a4859db",
     "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=8b11e9c64262b9275963",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=abb47a424c09ace77d79",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=74ec544ef21261233eb0",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=a2f4d89af612c02f8db7",
     "/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=ffd2f414666d7cc80b9d",
     "/chunks/database.js": "/chunks/database.js?id=0b21e6ff3bac5c963d9a",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=464c8e70974d492ce7f6",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=826fbaa6cc4acab69f5d",
     "/chunks/files.js": "/chunks/files.js?id=76b46f43df974e899836",
     "/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=8ccd35de575e8a91d02f",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=ac7424fc44caf9e64d1a",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=5ce881b7e565551072a9",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=ed167949ea9398f0fbeb",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7dfffa0f25308ba70b7a",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=7e3cc762ef272500487c",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=262f284d4edc13719b00",
     "/chunks/landing-page.js": "/chunks/landing-page.js?id=920418aa2cd205d96d0a",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=a28320bdc00aeb85409e",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=0607b8e16d6678e0b463",
-    "/chunks/pages.js": "/chunks/pages.js?id=7d3b984ad37798628e0d",
+    "/chunks/pages.js": "/chunks/pages.js?id=53cfb0cdbc2ecbc2111f",
     "/chunks/plan.js": "/chunks/plan.js?id=ed865758447ff7e3f2b5",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=f4199916eddc63fb1720",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=2a50cca120ca589f5626",
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=4a691e84a65d9a779d60",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8c85b14979d3fb6c54a3",
-    "/chunks/plans.js": "/chunks/plans.js?id=f1ce3fd32aec565ab459",
+    "/chunks/plans.js": "/chunks/plans.js?id=db810284f32ea3aa36ad",
     "/chunks/profile.js": "/chunks/profile.js?id=df174ba95616670c8edb",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=42dbd1e9d17515be4a7b",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=0c7dd358b177460faa74",
@@ -51,12 +51,12 @@
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=40d5eed52256ea23edbe",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=bc110f5ee1a5b984fda2",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=e318f7536b185dbe6b54",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=9be1d0aa0169eb57e78f",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=7782ad88fc805fe75f4c",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=22e7978fe8a5cb488e52",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=367c9478591c7a4a2889",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=7da589bd335deefd5f65",
     "/chunks/shared-files.js": "/chunks/shared-files.js?id=5d9381e60cc1307f715a",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=f0e6fb1cf70035c49362",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=6a76b27026b3ab28f544",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=703fbd23d18816590337",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=cedca52c29abfb3c58f1",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=b99eb91043d1321187b9",
@@ -74,9 +74,169 @@
     "/chunks/user-password.js": "/chunks/user-password.js?id=b036eeaa5ef8e798f6dd",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=a99910f95c3e39caa78b",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e8ea1e67f9ac0a835ed0",
-    "/chunks/users.js": "/chunks/users.js?id=aba8837f40fbb79f99b4",
-    "/js/main.1f3d44f14db2262cc1c6.hot-update.js": "/js/main.1f3d44f14db2262cc1c6.hot-update.js",
-    "/js/main.3681a718c84b2523e874.hot-update.js": "/js/main.3681a718c84b2523e874.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.16e87dbca64505b5cfac.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.16e87dbca64505b5cfac.hot-update.js",
-    "/js/main.9e6c37da83e8132013f6.hot-update.js": "/js/main.9e6c37da83e8132013f6.hot-update.js"
+    "/chunks/users.js": "/chunks/users.js?id=420d8c46141ab3e73395",
+    "/js/main.78345189ffe5a46eb733.hot-update.js": "/js/main.78345189ffe5a46eb733.hot-update.js",
+    "/js/main.a9ee8b961e0793d538c5.hot-update.js": "/js/main.a9ee8b961e0793d538c5.hot-update.js",
+    "/js/main.ae193cef0eff3e3a8720.hot-update.js": "/js/main.ae193cef0eff3e3a8720.hot-update.js",
+    "/js/main.73dc6123ad9fdd83192e.hot-update.js": "/js/main.73dc6123ad9fdd83192e.hot-update.js",
+    "/js/main.09797172c97676dcb7d3.hot-update.js": "/js/main.09797172c97676dcb7d3.hot-update.js",
+    "/js/main.22280fb56e14412f0654.hot-update.js": "/js/main.22280fb56e14412f0654.hot-update.js",
+    "/js/main.d052d03a07d5f662a4c6.hot-update.js": "/js/main.d052d03a07d5f662a4c6.hot-update.js",
+    "/js/main.a59fb54600028dba26a2.hot-update.js": "/js/main.a59fb54600028dba26a2.hot-update.js",
+    "/js/main.289f6745ab22b76b1764.hot-update.js": "/js/main.289f6745ab22b76b1764.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.16f1757769c4ee9a82d8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.16f1757769c4ee9a82d8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.64dfabe6aa9152ece945.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.64dfabe6aa9152ece945.hot-update.js",
+    "/js/main.65088f899dd66dcbfbf9.hot-update.js": "/js/main.65088f899dd66dcbfbf9.hot-update.js",
+    "/js/main.d2d7fb85bb726c32ef77.hot-update.js": "/js/main.d2d7fb85bb726c32ef77.hot-update.js",
+    "/js/main.5b9b84eda7480d5e433f.hot-update.js": "/js/main.5b9b84eda7480d5e433f.hot-update.js",
+    "/js/main.1ffaeeace8b622ed38bd.hot-update.js": "/js/main.1ffaeeace8b622ed38bd.hot-update.js",
+    "/js/main.eedbd2931a657c99d6b4.hot-update.js": "/js/main.eedbd2931a657c99d6b4.hot-update.js",
+    "/js/main.c177906f2916c1ea6387.hot-update.js": "/js/main.c177906f2916c1ea6387.hot-update.js",
+    "/js/main.7ee4615d49b92a1fb3c4.hot-update.js": "/js/main.7ee4615d49b92a1fb3c4.hot-update.js",
+    "/js/main.a903073890c57e1e6900.hot-update.js": "/js/main.a903073890c57e1e6900.hot-update.js",
+    "/js/main.7bc33ff73b3a3af5d4d8.hot-update.js": "/js/main.7bc33ff73b3a3af5d4d8.hot-update.js",
+    "/js/main.631abcdb80e5560a3e0d.hot-update.js": "/js/main.631abcdb80e5560a3e0d.hot-update.js",
+    "/js/main.1d48e63339a715ad95fd.hot-update.js": "/js/main.1d48e63339a715ad95fd.hot-update.js",
+    "/js/main.a5cb2225922b09534205.hot-update.js": "/js/main.a5cb2225922b09534205.hot-update.js",
+    "/js/main.1c6b7e787c290349bf2f.hot-update.js": "/js/main.1c6b7e787c290349bf2f.hot-update.js",
+    "/js/main.1b948cc9a0ac73fb4614.hot-update.js": "/js/main.1b948cc9a0ac73fb4614.hot-update.js",
+    "/js/main.69bd40e22ae86e0950fe.hot-update.js": "/js/main.69bd40e22ae86e0950fe.hot-update.js",
+    "/js/main.3dc0753cc7e4dff10c3a.hot-update.js": "/js/main.3dc0753cc7e4dff10c3a.hot-update.js",
+    "/chunks/files.8f48d097efbbe17271ff.hot-update.js": "/chunks/files.8f48d097efbbe17271ff.hot-update.js",
+    "/chunks/files.24e0c15cec54e2b8aa2c.hot-update.js": "/chunks/files.24e0c15cec54e2b8aa2c.hot-update.js",
+    "/chunks/files.a1643f867bec922ea5d8.hot-update.js": "/chunks/files.a1643f867bec922ea5d8.hot-update.js",
+    "/chunks/files.7d3ca07dc09183d04f15.hot-update.js": "/chunks/files.7d3ca07dc09183d04f15.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.7512c9aee53dc8a715e4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7512c9aee53dc8a715e4.hot-update.js",
+    "/js/main.b6d4b8e7f03561865bad.hot-update.js": "/js/main.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/dashboard.b6d4b8e7f03561865bad.hot-update.js": "/chunks/dashboard.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-methods~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-methods~chunks/users.js?id=2bb9ebac09457d3b898e",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b6d4b8e7f03561865bad.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/invoices.b6d4b8e7f03561865bad.hot-update.js": "/chunks/invoices.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/pages.b6d4b8e7f03561865bad.hot-update.js": "/chunks/pages.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/plans.b6d4b8e7f03561865bad.hot-update.js": "/chunks/plans.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/settings-payment-methods.b6d4b8e7f03561865bad.hot-update.js": "/chunks/settings-payment-methods.b6d4b8e7f03561865bad.hot-update.js",
+    "/chunks/users.b6d4b8e7f03561865bad.hot-update.js": "/chunks/users.b6d4b8e7f03561865bad.hot-update.js",
+    "/js/main.fb6332e64634a23c55ac.hot-update.js": "/js/main.fb6332e64634a23c55ac.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fb6332e64634a23c55ac.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fb6332e64634a23c55ac.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.0a64d3fae7cbc8b73bd3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0a64d3fae7cbc8b73bd3.hot-update.js",
+    "/js/main.591faf3a646b9756fe2f.hot-update.js": "/js/main.591faf3a646b9756fe2f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.591faf3a646b9756fe2f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.591faf3a646b9756fe2f.hot-update.js",
+    "/js/main.0df7cc320fd4b0e8b0e0.hot-update.js": "/js/main.0df7cc320fd4b0e8b0e0.hot-update.js",
+    "/js/main.e285e8b13b33759c49c4.hot-update.js": "/js/main.e285e8b13b33759c49c4.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.21b819136c4b4ed4ba98.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.21b819136c4b4ed4ba98.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.cc42b1ce2c9a4347eab1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cc42b1ce2c9a4347eab1.hot-update.js",
+    "/js/main.3dfd066b2e45157f66c8.hot-update.js": "/js/main.3dfd066b2e45157f66c8.hot-update.js",
+    "/js/main.d32141dd3b2f49392737.hot-update.js": "/js/main.d32141dd3b2f49392737.hot-update.js",
+    "/js/main.a2d5a224505ce18b68d5.hot-update.js": "/js/main.a2d5a224505ce18b68d5.hot-update.js",
+    "/js/main.7066a945f62073cedc89.hot-update.js": "/js/main.7066a945f62073cedc89.hot-update.js",
+    "/js/main.05f3ec9c0f44837d49bc.hot-update.js": "/js/main.05f3ec9c0f44837d49bc.hot-update.js",
+    "/js/main.6bd6b13277627fadbf7c.hot-update.js": "/js/main.6bd6b13277627fadbf7c.hot-update.js",
+    "/js/main.581b7e7be1c09775ee1d.hot-update.js": "/js/main.581b7e7be1c09775ee1d.hot-update.js",
+    "/js/main.a03f94dda9d1eb86c196.hot-update.js": "/js/main.a03f94dda9d1eb86c196.hot-update.js",
+    "/js/main.9c8f50bff339bdd4a141.hot-update.js": "/js/main.9c8f50bff339bdd4a141.hot-update.js",
+    "/js/main.8e2a2f26b6b21dfd2da3.hot-update.js": "/js/main.8e2a2f26b6b21dfd2da3.hot-update.js",
+    "/js/main.4a6b3c47f3b5b9e0af99.hot-update.js": "/js/main.4a6b3c47f3b5b9e0af99.hot-update.js",
+    "/js/main.bdb141604c8e07109d92.hot-update.js": "/js/main.bdb141604c8e07109d92.hot-update.js",
+    "/js/main.75dd838b0708ce9b2adf.hot-update.js": "/js/main.75dd838b0708ce9b2adf.hot-update.js",
+    "/js/main.745079f910f42aab3124.hot-update.js": "/js/main.745079f910f42aab3124.hot-update.js",
+    "/chunks/shared-page.00a2dc93381f758c0280.hot-update.js": "/chunks/shared-page.00a2dc93381f758c0280.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.28668a47ef3b76a1d5de.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.28668a47ef3b76a1d5de.hot-update.js",
+    "/js/main.9f7c25b28e225b33dc09.hot-update.js": "/js/main.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/dashboard.9f7c25b28e225b33dc09.hot-update.js": "/chunks/dashboard.9f7c25b28e225b33dc09.hot-update.js",
+    "/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=2256b90ad9fb36944861",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9f7c25b28e225b33dc09.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/invoices.9f7c25b28e225b33dc09.hot-update.js": "/chunks/invoices.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/pages.9f7c25b28e225b33dc09.hot-update.js": "/chunks/pages.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/plans.9f7c25b28e225b33dc09.hot-update.js": "/chunks/plans.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/settings-payment-methods.9f7c25b28e225b33dc09.hot-update.js": "/chunks/settings-payment-methods.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/users.9f7c25b28e225b33dc09.hot-update.js": "/chunks/users.9f7c25b28e225b33dc09.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.76134f5997cb5d4c42ef.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.76134f5997cb5d4c42ef.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.a4c1c3eea6374dec236f.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.a4c1c3eea6374dec236f.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.4dd9f1600a1ce8bec5b4.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.4dd9f1600a1ce8bec5b4.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.dba6dc5de0c840329886.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.dba6dc5de0c840329886.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.bb998b452afb75fd7d7d.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.bb998b452afb75fd7d7d.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.469e4c61da02512e262f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.469e4c61da02512e262f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.a0761457143d520de767.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a0761457143d520de767.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.05d7323f041960cd662a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.05d7323f041960cd662a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.ddc442c559466e068533.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ddc442c559466e068533.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.1d5e8fef48e8cba8fb0e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1d5e8fef48e8cba8fb0e.hot-update.js",
+    "/js/main.5f849cfdc44588d180e9.hot-update.js": "/js/main.5f849cfdc44588d180e9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.72ef842c36aba19a4753.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.72ef842c36aba19a4753.hot-update.js",
+    "/js/main.f85012cf694686c909b8.hot-update.js": "/js/main.f85012cf694686c909b8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.a9c465f8b5b9c1cdd1df.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a9c465f8b5b9c1cdd1df.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.7f0be7a265deeae2f69c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7f0be7a265deeae2f69c.hot-update.js",
+    "/js/main.47753dfe29b7311ea95c.hot-update.js": "/js/main.47753dfe29b7311ea95c.hot-update.js",
+    "/js/main.0815c4db0eb4b2603325.hot-update.js": "/js/main.0815c4db0eb4b2603325.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e1ee39409a5334230ff7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e1ee39409a5334230ff7.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.7a9d08ef5913690da9cb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7a9d08ef5913690da9cb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b63ac896d36d5ac00245.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b63ac896d36d5ac00245.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.adbdc46aebdb0ee594fc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.adbdc46aebdb0ee594fc.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8c7dc34edfb379b0c8df.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8c7dc34edfb379b0c8df.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6243506c5b7a89391be2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6243506c5b7a89391be2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b071d13331f725cf1ca9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b071d13331f725cf1ca9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.214b8fa1c93bf716a98c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.214b8fa1c93bf716a98c.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.4e7225ba5ca82f5e9ab8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4e7225ba5ca82f5e9ab8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.3c9922f24bebd8176629.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3c9922f24bebd8176629.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.f699e6e645bad5e09a7f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f699e6e645bad5e09a7f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b5a35f6f7f5ba3799654.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b5a35f6f7f5ba3799654.hot-update.js",
+    "/chunks/files.b15eb9222afffcceacab.hot-update.js": "/chunks/files.b15eb9222afffcceacab.hot-update.js",
+    "/chunks/files.94fc0822585be89b8286.hot-update.js": "/chunks/files.94fc0822585be89b8286.hot-update.js",
+    "/chunks/files.4299901f537a5fd01c69.hot-update.js": "/chunks/files.4299901f537a5fd01c69.hot-update.js",
+    "/chunks/files.5daf135324d15333cbe4.hot-update.js": "/chunks/files.5daf135324d15333cbe4.hot-update.js",
+    "/chunks/files.b35e87a4d59de8bb2746.hot-update.js": "/chunks/files.b35e87a4d59de8bb2746.hot-update.js",
+    "/chunks/files.32b00a994aafc23016d9.hot-update.js": "/chunks/files.32b00a994aafc23016d9.hot-update.js",
+    "/chunks/files.b728489579a4a4463dca.hot-update.js": "/chunks/files.b728489579a4a4463dca.hot-update.js",
+    "/chunks/files.dc3773af0f2b8f68723b.hot-update.js": "/chunks/files.dc3773af0f2b8f68723b.hot-update.js",
+    "/chunks/files.50b4d49be6ba4f2f5a42.hot-update.js": "/chunks/files.50b4d49be6ba4f2f5a42.hot-update.js",
+    "/js/main.bdffe78bb76e15100354.hot-update.js": "/js/main.bdffe78bb76e15100354.hot-update.js",
+    "/js/main.b497188f2e593e9126b5.hot-update.js": "/js/main.b497188f2e593e9126b5.hot-update.js",
+    "/js/main.c90716cd994381458498.hot-update.js": "/js/main.c90716cd994381458498.hot-update.js",
+    "/js/main.9a9a03613c75d690e54e.hot-update.js": "/js/main.9a9a03613c75d690e54e.hot-update.js",
+    "/chunks/files.ab761633112c76589c39.hot-update.js": "/chunks/files.ab761633112c76589c39.hot-update.js",
+    "/chunks/files.7d0daf64539a27830869.hot-update.js": "/chunks/files.7d0daf64539a27830869.hot-update.js",
+    "/chunks/files.5d5d98f68fe41da9e490.hot-update.js": "/chunks/files.5d5d98f68fe41da9e490.hot-update.js",
+    "/chunks/files.b2aa9de7d9bcb37106fa.hot-update.js": "/chunks/files.b2aa9de7d9bcb37106fa.hot-update.js",
+    "/chunks/files.a82a38e6a2fbab2caf14.hot-update.js": "/chunks/files.a82a38e6a2fbab2caf14.hot-update.js",
+    "/chunks/files.6c3eed2b7686d1812896.hot-update.js": "/chunks/files.6c3eed2b7686d1812896.hot-update.js",
+    "/chunks/files.9afd6379b39f22b09276.hot-update.js": "/chunks/files.9afd6379b39f22b09276.hot-update.js",
+    "/chunks/files.6733ab901334a5db26b4.hot-update.js": "/chunks/files.6733ab901334a5db26b4.hot-update.js",
+    "/chunks/files.c49043d7042db8ce1426.hot-update.js": "/chunks/files.c49043d7042db8ce1426.hot-update.js",
+    "/js/main.cc20d712f4d33392705f.hot-update.js": "/js/main.cc20d712f4d33392705f.hot-update.js",
+    "/js/main.7c36b4071327c3a78db3.hot-update.js": "/js/main.7c36b4071327c3a78db3.hot-update.js",
+    "/js/main.04c397efd85e2c6d02e0.hot-update.js": "/js/main.04c397efd85e2c6d02e0.hot-update.js",
+    "/js/main.6935a8ac5387707161c6.hot-update.js": "/js/main.6935a8ac5387707161c6.hot-update.js",
+    "/js/main.5fde5438339e707dfeba.hot-update.js": "/js/main.5fde5438339e707dfeba.hot-update.js",
+    "/js/main.b753b826dce35eafac0e.hot-update.js": "/js/main.b753b826dce35eafac0e.hot-update.js",
+    "/chunks/files.ac18ee4b1f8c93620575.hot-update.js": "/chunks/files.ac18ee4b1f8c93620575.hot-update.js",
+    "/chunks/files.5aa92bd2842177b36079.hot-update.js": "/chunks/files.5aa92bd2842177b36079.hot-update.js",
+    "/chunks/files.98bf2e0c58c30386e2f6.hot-update.js": "/chunks/files.98bf2e0c58c30386e2f6.hot-update.js",
+    "/chunks/files.afad53d1a5f25afc6e0e.hot-update.js": "/chunks/files.afad53d1a5f25afc6e0e.hot-update.js",
+    "/chunks/files.d8644b75fcd2b43c37d2.hot-update.js": "/chunks/files.d8644b75fcd2b43c37d2.hot-update.js",
+    "/chunks/files.6301c839083e9d0dfbc8.hot-update.js": "/chunks/files.6301c839083e9d0dfbc8.hot-update.js",
+    "/chunks/files.ebbafd129d1376fc0d9f.hot-update.js": "/chunks/files.ebbafd129d1376fc0d9f.hot-update.js",
+    "/chunks/files.1a6dd44e90406ba6bd0a.hot-update.js": "/chunks/files.1a6dd44e90406ba6bd0a.hot-update.js",
+    "/chunks/files.406ce722f64c4b7f2ab2.hot-update.js": "/chunks/files.406ce722f64c4b7f2ab2.hot-update.js",
+    "/js/main.aa5701e14cfe86897812.hot-update.js": "/js/main.aa5701e14cfe86897812.hot-update.js",
+    "/js/main.bad5e89e123a99244ef0.hot-update.js": "/js/main.bad5e89e123a99244ef0.hot-update.js",
+    "/js/main.021f5969eef9179d1773.hot-update.js": "/js/main.021f5969eef9179d1773.hot-update.js",
+    "/js/main.5f33fbf584a19b162812.hot-update.js": "/js/main.5f33fbf584a19b162812.hot-update.js",
+    "/chunks/files.b0c6cfe2e1fbd0224175.hot-update.js": "/chunks/files.b0c6cfe2e1fbd0224175.hot-update.js",
+    "/chunks/files.09e1294cec8f988267cf.hot-update.js": "/chunks/files.09e1294cec8f988267cf.hot-update.js",
+    "/chunks/files.1e88c592d913ce1d36ff.hot-update.js": "/chunks/files.1e88c592d913ce1d36ff.hot-update.js",
+    "/chunks/files.9957ad0f3e91b49833cd.hot-update.js": "/chunks/files.9957ad0f3e91b49833cd.hot-update.js",
+    "/chunks/files.83ca606a78e2d2f610cb.hot-update.js": "/chunks/files.83ca606a78e2d2f610cb.hot-update.js",
+    "/chunks/files.4e0eb2a297c360ba2550.hot-update.js": "/chunks/files.4e0eb2a297c360ba2550.hot-update.js",
+    "/chunks/files.40dbf31b426c5897ed1a.hot-update.js": "/chunks/files.40dbf31b426c5897ed1a.hot-update.js",
+    "/chunks/files.ba20d2fbded1aaa85fcf.hot-update.js": "/chunks/files.ba20d2fbded1aaa85fcf.hot-update.js",
+    "/chunks/files.9a44c63f9a7bdeeca48b.hot-update.js": "/chunks/files.9a44c63f9a7bdeeca48b.hot-update.js",
+    "/chunks/files.79c74d7036fa3d068c37.hot-update.js": "/chunks/files.79c74d7036fa3d068c37.hot-update.js",
+    "/chunks/files.518d9683e282d31d90a7.hot-update.js": "/chunks/files.518d9683e282d31d90a7.hot-update.js",
+    "/chunks/files.474fad41a557b8417408.hot-update.js": "/chunks/files.474fad41a557b8417408.hot-update.js",
+    "/chunks/files.25007920c63ea3c7fa9f.hot-update.js": "/chunks/files.25007920c63ea3c7fa9f.hot-update.js",
+    "/chunks/files.532c5a9527b20981d3c7.hot-update.js": "/chunks/files.532c5a9527b20981d3c7.hot-update.js",
+    "/chunks/files.89eb8c55139fe768f578.hot-update.js": "/chunks/files.89eb8c55139fe768f578.hot-update.js",
+    "/chunks/files.b5a950a4e83c3b4a804b.hot-update.js": "/chunks/files.b5a950a4e83c3b4a804b.hot-update.js",
+    "/chunks/files.8bff07f34e8a965feeb6.hot-update.js": "/chunks/files.8bff07f34e8a965feeb6.hot-update.js",
+    "/js/main.08729f947c82898b3e91.hot-update.js": "/js/main.08729f947c82898b3e91.hot-update.js",
+    "/chunks/files.5703b7674226ada2ddda.hot-update.js": "/chunks/files.5703b7674226ada2ddda.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index a4bc67bf..1ae34c5b 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -31,6 +31,9 @@
             <!--  Drag & Drop UI -->
             <DragUI/>
 
+            <!-- Mobile menu for selecting view and sorting -->
+            <MobileSortingAndPreview/>
+
             <!--Mobile Menu-->
             <MobileMenu/>
 
@@ -56,6 +59,7 @@
 </template>
 
 <script>
+    import MobileSortingAndPreview from '@/components/FilesView/MobileSortingAndPreview'
     import MobileMultiSelectMenu from '@/components/FilesView/MobileMultiSelectMenu'
     import ToastrWrapper from '@/components/Others/Notifications/ToastrWrapper'
     import FileFullPreview from '@/components/FilesView/FileFullPreview'
@@ -78,6 +82,7 @@
     export default {
         name: 'app',
         components: {
+            MobileSortingAndPreview,
             MobileMultiSelectMenu,
             MobileNavigation,
             CookieDisclaimer,
diff --git a/resources/js/components/FilesView/MobileActionButton.vue b/resources/js/components/FilesView/MobileActionButton.vue
index 03d45166..7e2e35a5 100644
--- a/resources/js/components/FilesView/MobileActionButton.vue
+++ b/resources/js/components/FilesView/MobileActionButton.vue
@@ -8,6 +8,24 @@
             <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>
+            <svg v-if="icon === 'preview-sorting'" size="15" class="icon"
+                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">
+                    <g id="Storage-Alert-Copy" transform="translate(-1092.000000, -28.000000)" stroke="#000000" stroke-width="1.4">
+                        <g id="Toolbar" transform="translate(331.000000, 19.000000)">
+                            <g id="Tools" transform="translate(581.000000, 9.000000)">
+                                <g id="sort-icon" transform="translate(181.000000, 1.000000)">
+                                    <rect id="Rectangle" x="9.77777778" y="0" width="6.22222222" height="6.22222222"></rect>
+                                    <rect id="Rectangle" x="9.77777778" y="9.77777778" width="6.22222222" height="6.22222222"></rect>
+                                    <line x1="0" y1="2" x2="6" y2="2" id="Path"></line>
+                                    <line x1="0" y1="8" x2="6" y2="8" id="Path"></line>
+                                    <line x1="0" y1="14" x2="6" y2="14" id="Path"></line>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </svg>
             <span class="label">
                 <slot></slot>
             </span>
diff --git a/resources/js/components/FilesView/MobileActions.vue b/resources/js/components/FilesView/MobileActions.vue
index d899dc90..3fc41907 100644
--- a/resources/js/components/FilesView/MobileActions.vue
+++ b/resources/js/components/FilesView/MobileActions.vue
@@ -3,8 +3,8 @@
 
         <!--Actions for trash location with MASTER permission--->
         <div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master')" class="mobile-actions">
-            <MobileActionButton @click.native="switchPreview" :icon="previewIcon">
-                {{ previewText }}
+            <MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
+                View  Sorting
             </MobileActionButton>
             <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
                 {{ $t('context_menu.select') }}
@@ -25,15 +25,15 @@
             <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
                {{ $t('context_menu.select') }}
             </MobileMultiSelectButton>
-            <MobileActionButton @click.native="switchPreview" :icon="previewIcon">
-                {{ previewText }}
+            <MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
+                View  Sorting
             </MobileActionButton>
         </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">
-            <MobileActionButton @click.native="switchPreview" :icon="previewIcon">
-                {{ previewText }}
+            <MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
+                View  Sorting
             </MobileActionButton>
              <MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
                {{ $t('context_menu.select') }}
@@ -67,14 +67,12 @@
             previewIcon() {
                 return this.FilePreviewType === 'list' ? 'th' : 'th-list'
             },
-            previewText() {
-                return this.FilePreviewType === 'list' ? this.$t('preview_type.grid') : this.$t('preview_type.list')
-            }
         },
         data () {
             return {
                 mobileMultiSelect: false,
-                turnOff:false
+                turnOff:false,
+                mobileSortingAndPreview: false
             }
         },
         watch: {
@@ -86,13 +84,19 @@
                 if(!this.mobileMultiSelect) {
                     events.$emit('mobileSelecting-stop')
                 }
+            },
+            mobileSortingAndPreview (oldValue , newValue) {
+                if(this.mobileSortingAndPreview) {
+                    events.$emit('mobileSortingAndPreview-open')
+                    this.mobileMultiSelect = false
+                }
+
+                if(!this.mobileSortingAndPreview && oldValue !== newValue) {
+                    events.$emit('mobileSortingAndPreview-close')
+                }
             }
         },
         methods: {
-            switchPreview() {
-                this.$store.dispatch('changePreviewType')
-                events.$emit('mobileSelecting-stop')
-            },
             createFolder() {
                 if (this.$isMobile()) {
                     // Get folder name
@@ -111,6 +115,11 @@
                     this.mobileMultiSelect = false
                 }) 
 
+                events.$on('mobileSortingAndPreview-close', () => {
+                    this.mobileSortingAndPreview = false
+                })
+                
+
         }
     }
 </script>
@@ -118,6 +127,11 @@
 <style scoped lang="scss">
     @import '@assets/vue-file-manager/_variables';
     @import '@assets/vue-file-manager/_mixins';
+    .active {
+            /deep/.label {
+                color: $theme !important;
+            }
+    }
 
     #mobile-actions-wrapper {
         display: none;
diff --git a/resources/js/components/FilesView/MobileSortingAndPreview.vue b/resources/js/components/FilesView/MobileSortingAndPreview.vue
new file mode 100644
index 00000000..bd5c69b4
--- /dev/null
+++ b/resources/js/components/FilesView/MobileSortingAndPreview.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="options-wrapper"  >
+    <transition name="context-menu">
+      <div
+        class="options"
+        v-if="isVisible"
+      >
+          <div class="menu-options">
+
+            <ul class="menu-option-group">
+              <li class="menu-option" @click="changePreview('grid')"
+              >
+                <div class="icon">
+                  <grid-icon size="17"/>
+                </div>
+                <div class="text-label">
+                  {{$t('preview_sorting.grid_view')}}
+                </div>
+                <div class="show-icon" v-if="isGrid">
+                        <check-icon size="17"/>
+                </div>
+              </li>
+              <li class="menu-option" @click="changePreview('list')">
+                <div class="icon">
+                  <list-icon size="17"/>
+                </div>
+                <div class="text-label">
+                  {{$t('preview_sorting.list_view')}}
+                </div>
+                 <div class="show-icon" v-if="isList">
+                        <check-icon size="17"/>
+                </div>
+              </li>
+            </ul>
+
+            <ul class="menu-option-group">
+              <li c class="menu-option" @click="sort('created_at')">
+                <div class="icon">
+                  <calendar-icon size="17"/>
+                </div>
+                <div class="text-label">
+                   {{$t('preview_sorting.sort_date')}}
+                </div>
+                <div class="show-icon" >
+                        <arrow-up-icon size="17" v-if="filter.field === 'created_at'" :class="{ 'arrow-down': filter.sort === 'ASC' }"/>
+                </div>
+              </li>
+              <li class="menu-option" @click="sort('name')" >
+                <div class="icon">
+                  <alphabet-icon size="17" class="aplhabet-icon"/>
+                </div>
+                <div class="text-label">
+                  {{$t('preview_sorting.sort_alphabet')}}
+                </div>
+                <div class="show-icon">
+                    <arrow-up-icon size="17" v-if="filter.field === 'name'" :class="{ 'arrow-down': filter.sort === 'ASC' }"/>
+                </div>
+              </li>
+            </ul>
+          </div>
+
+      </div>
+    </transition>
+    <transition name="fade">
+      <div
+        v-show="isVisible"
+        class="vignette"
+        @click.self="close"
+      ></div>
+    </transition>
+  </div>
+</template>
+
+<script>
+
+import { CalendarIcon, ListIcon, GridIcon, ArrowUpIcon, CheckIcon } from 'vue-feather-icons'
+import AlphabetIcon from '@/components/FilesView/Icons/AlphabetIcon'
+import { mapGetters } from 'vuex'
+import { events } from '@/bus'
+
+export default {
+    name: "MobileSortingAndPreview",
+    components: {
+        CalendarIcon,
+        AlphabetIcon,
+        ArrowUpIcon,
+        CheckIcon,
+        ListIcon,
+        GridIcon
+    },
+    computed: {
+        ...mapGetters(['FilePreviewType']),
+        isGrid() {
+            return this.FilePreviewType === 'grid'
+        },
+        isList() {
+            return this.FilePreviewType === 'list'
+        },
+    },
+    data () {
+            return {
+                isVisible: false,
+                filter: {
+                    sort: 'DESC',
+                    field: undefined,
+                }
+            }
+        },
+    methods: {
+      close() {
+        this.isVisible = false
+        events.$emit('mobileSortingAndPreview-close')
+      },
+        sort (field) {
+
+            this.filter.field = field
+
+              // Set sorting direction
+            if (this.filter.sort === 'DESC') {
+                this.filter.sort = 'ASC'
+            } else if (this.filter.sort === 'ASC') {
+                this.filter.sort = 'DESC'
+            }
+
+            // Save to localStorage sorting options
+            localStorage.setItem('sorting', JSON.stringify({sort: this.filter.sort , field: this.filter.field}))
+
+            // Update sorting state in vuex
+            this.$store.commit('UPDATE_SORTING')
+            
+            // Get data using the application location
+            this.$getDataByLocation()
+        },
+        changePreview(previewType) {
+            this.$store.dispatch('changePreviewType' , previewType)
+        }
+    },
+    mounted () {
+
+          let sorting = JSON.parse(localStorage.getItem('sorting'))
+
+          // Set default sorting if is not setup in LocalStorage
+          this.filter.sort = sorting ? sorting.sort : 'DESC'
+          this.filter.field = sorting ? sorting.field : 'created_at'
+
+          events.$on('mobileSortingAndPreview-open', () => {
+              this.isVisible = true
+          })
+
+          events.$on('mobileSortingAndPreview-close', () => {
+          this.isVisible = false
+          })
+      }
+};
+</script>
+
+<style scoped lang="scss">
+@import "@assets/vue-file-manager/_variables";
+@import "@assets/vue-file-manager/_mixins";
+
+.show-icon {
+    margin-left: auto;
+    max-height: 19px;
+     .arrow-down {
+        @include transform(rotate(180deg));
+    }
+}
+.icon {
+        margin-right: 20px;
+        line-height: 0; 
+        .aplhabet-icon {
+            /deep/line,
+            /deep/polyline {
+                stroke:$text ;
+            }
+        }
+            
+    }
+
+.menu-option {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin-right: 20px;
+    line-height: 0;
+  }
+
+  .text-label {
+    @include font-size(16);
+  }
+}
+
+.vignette {
+  background: rgba(0, 0, 0, 0.35);
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 9;
+  cursor: pointer;
+  opacity: 1;
+}
+
+.options {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 99;
+  overflow: hidden;
+  background: white;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+
+  .menu-options {
+    margin-top: 10px;
+    list-style: none;
+    width: 100%;
+
+    .menu-option-group {
+      padding: 5px 0;
+      border-bottom: 1px solid $light_mode_border;
+
+      &:first-child {
+        padding-top: 0;
+      }
+
+      &:last-child {
+        padding-bottom: 0;
+        border-bottom: none;
+      }
+    }
+
+    .menu-option {
+      font-weight: 700;
+      letter-spacing: 0.15px;
+      @include font-size(14);
+      cursor: pointer;
+      width: 100%;
+      padding: 17px 20px;
+      text-align: center;
+
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  .vignette {
+    background: $dark_mode_vignette;
+  }
+
+  .options {
+    background: $dark_mode_background;
+
+    .menu-options {
+      background: $dark_mode_background;
+
+      .menu-option-group {
+        border-color: $dark_mode_border_color;
+      }
+
+      .menu-option {
+        color: $dark_mode_text_primary;
+      }
+    }
+  }
+  .icon {
+      .aplhabet-icon {
+          /deep/line,
+          /deep/polyline {
+              stroke:$dark_mode_text_primary ;
+          }
+      }
+  }
+}
+
+// Transition
+.context-menu-enter-active,
+.fade-enter-active {
+  transition: all 200ms;
+}
+
+.context-menu-leave-active,
+.fade-leave-active {
+  transition: all 200ms;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.context-menu-enter,
+.context-menu-leave-to {
+  opacity: 0;
+  transform: translateY(100%);
+}
+
+.context-menu-leave-active {
+  position: absolute;
+}
+</style>
diff --git a/resources/js/components/FilesView/SortingAndPreview.vue b/resources/js/components/FilesView/SortingAndPreview.vue
index a4918f89..9e1824c4 100644
--- a/resources/js/components/FilesView/SortingAndPreview.vue
+++ b/resources/js/components/FilesView/SortingAndPreview.vue
@@ -102,8 +102,13 @@
                     this.filter.sort = 'DESC'
                 }
 
+                // Save to localStorage sorting options
                 localStorage.setItem('sorting', JSON.stringify({sort: this.filter.sort , field: this.filter.field}))
+
+                // Update sorting state in vuex
+                this.$store.commit('UPDATE_SORTING')
                 
+                // Get data using the application location
                 this.$getDataByLocation()
             },
             changePreview(previewType) {
@@ -114,6 +119,7 @@
 
             let sorting = JSON.parse(localStorage.getItem('sorting'))
 
+            // Set default sorting if in not setup in LocalStorage
             this.filter.sort = sorting ? sorting.sort : 'DESC'
             this.filter.field = sorting ? sorting.field : 'created_at'
 
diff --git a/resources/js/main.js b/resources/js/main.js
index 50e6ac7b..d1c70a4c 100644
--- a/resources/js/main.js
+++ b/resources/js/main.js
@@ -97,6 +97,7 @@ document.addEventListener('drag', (event) => {
 
 },false)
 
+// Handle for drop 
 document.addEventListener("dragend", () => {
   events.$emit('drop')
 }, false);
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index 58370b23..53f58fe4 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -8,6 +8,10 @@ const defaultState = {
 	authorized: undefined,
 	homeDirectory: undefined,
 	requestedPlan: undefined,
+	sorting: {
+		sort: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).sort : 'DESC',
+		field: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).field : 'created_at',
+	},
 	roles: [
 		{
 			label: i18n.t('roles.admin'),
@@ -861,6 +865,10 @@ const actions = {
 	},
 }
 const mutations = {
+	UPDATE_SORTING(state) {
+		state.sorting.field = JSON.parse(localStorage.getItem('sorting')).field
+		state.sorting.sort = JSON.parse(localStorage.getItem('sorting')).sort
+	},
 	INIT(state, data) {
 		state.config = data.config
 		state.authorized = data.authCookie
@@ -902,6 +910,9 @@ const getters = {
 	config: state => state.config,
 	index: state => state.index,
 	roles: state => state.roles,
+	sorting: (state) => {
+		return  {sorting: state.sorting , URI: '?sort=' + state.sorting.field + '&direction=' + state.sorting.sort}
+	},
 }
 
 export default {
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 069d0b8c..eeefc4e6 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -20,10 +20,6 @@ const actions = {
     getFolder: ({commit, getters}, [payload]) => {
         commit('LOADING_STATE', {loading: true, data: []})
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
-
         if (payload.init)
             commit('FLUSH_FOLDER_HISTORY')
 
@@ -44,7 +40,7 @@ const actions = {
             : '/folders/' + payload.folder.unique_id
 
         axios
-            .get(getters.api + url + sortingUrl)
+            .get(getters.api + url + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 commit('STORE_CURRENT_FOLDER', payload.folder)
@@ -75,10 +71,6 @@ const actions = {
     getLatest: ({commit, getters}) => {
         commit('LOADING_STATE', {loading: true, data: []})
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
-
         commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
         commit('STORE_CURRENT_FOLDER', {
             name: i18n.t('sidebar.latest'),
@@ -87,7 +79,7 @@ const actions = {
         })
 
         axios
-            .get(getters.api + '/latest' + sortingUrl)
+            .get(getters.api + '/latest' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 events.$emit('scrollTop')
@@ -98,9 +90,6 @@ const actions = {
         commit('LOADING_STATE', {loading: true, data: []})
         commit('FLUSH_FOLDER_HISTORY')
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
 
         let currentFolder = {
             name: i18n.t('sidebar.my_shared'),
@@ -111,7 +100,7 @@ const actions = {
         commit('STORE_CURRENT_FOLDER', currentFolder)
 
         axios
-            .get(getters.api + '/shared-all' + sortingUrl)
+            .get(getters.api + '/shared-all' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 commit('STORE_PREVIOUS_FOLDER', currentFolder)
@@ -123,10 +112,6 @@ const actions = {
     getParticipantUploads: ({commit, getters}) => {
         commit('LOADING_STATE', {loading: true, data: []})
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
-
         commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
         commit('STORE_CURRENT_FOLDER', {
             name: i18n.t('sidebar.participant_uploads'),
@@ -135,7 +120,7 @@ const actions = {
         })
 
         axios
-            .get(getters.api + '/participant-uploads' + sortingUrl)
+            .get(getters.api + '/participant-uploads' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
 
@@ -147,11 +132,6 @@ const actions = {
         commit('LOADING_STATE', {loading: true, data: []})
         commit('FLUSH_FOLDER_HISTORY')
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
-
-
         let trash = {
             name: i18n.t('locations.trash'),
             unique_id: undefined,
@@ -161,7 +141,7 @@ const actions = {
         commit('STORE_CURRENT_FOLDER', trash)
 
         axios
-            .get(getters.api + '/trash' + sortingUrl)
+            .get(getters.api + '/trash' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 commit('STORE_PREVIOUS_FOLDER', trash)
@@ -195,10 +175,6 @@ const actions = {
     },
     getFolderTree: ({commit, getters}) => {
 
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
-
         return new Promise((resolve, reject) => {
 
             // Get route
@@ -212,7 +188,7 @@ const actions = {
                 route = '/api/navigation'
 
             axios
-                .get(route + sortingUrl)
+                .get(route + getters.sorting.URI)
                 .then(response => {
                     resolve(response)
 
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 4b57e444..d08dadb6 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -11,13 +11,10 @@ const defaultState = {
 
 const actions = {
     getAppData: ({commit, getters}) => {
-        let getSort = JSON.parse(localStorage.getItem('sorting'))
-        let sorting = {sort : getSort ? getSort.sort : 'DESC' , field:getSort ? getSort.field : 'created_at'}
-        let sortingUrl =  '?sort=' + sorting.field + '&direction=' + sorting.sort
 
         return new Promise((resolve, reject) => {
             axios
-                .get(getters.api + '/user' + sortingUrl)
+                .get(getters.api + '/user' + getters.sorting.URI)
                 .then((response) => {
                     resolve(response)
 
diff --git a/resources/js/views/Shared/SharedPage.vue b/resources/js/views/Shared/SharedPage.vue
index 3ea1b9dc..3ddf6def 100644
--- a/resources/js/views/Shared/SharedPage.vue
+++ b/resources/js/views/Shared/SharedPage.vue
@@ -21,6 +21,9 @@
         <!--Mobile Menu-->
         <MobileMenu/>
 
+        <!-- Mobile menu for selecting view and sorting -->
+        <MobileSortingAndPreview/>
+
         <!--System alerts-->
         <Alert />
 
@@ -111,6 +114,7 @@
 
 <script>
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import MobileSortingAndPreview from '@/components/FilesView/MobileSortingAndPreview'
     import MobileMultiSelectMenu from '@/components/FilesView/MobileMultiSelectMenu'
     import SortingAndPreview from '@/components/FilesView/SortingAndPreview'
     import TreeMenuNavigator from '@/components/Others/TreeMenuNavigator'
@@ -142,6 +146,7 @@
     export default {
         name: 'SharedPage',
         components: {
+            MobileSortingAndPreview,
             MobileMultiSelectMenu,
             ValidationProvider,
             SortingAndPreview,