diff --git a/config/language-translations.php b/config/language-translations.php
index d93c7af5..e4e9d8c8 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -90,8 +90,6 @@ return [
         "admin_settings.tabs.payments"                        => "Payments",
         "global.monthly_ac"                                   => "Mo.",
         "global.premium"                                      => "Premium",
-        "global.saas"                                         => "Services",
-        "global.subscription"                                 => "Subscription",
         "global.upgrade_plan"                                 => "Upgrade Plan",
         "incomplete_payment.description"                      => "Your latest payment is incomplete. {0}",
         "incomplete_payment.href"                             => "Please confirm your payment.",
@@ -380,7 +378,6 @@ return [
         "global.free"                                      => "Free",
         "global.get_it"                                    => "Get It",
         "global.incomplete"                                => "Incomplete",
-        "global.menu"                                      => "Menu",
         "global.or"                                        => "or",
         "global.total"                                     => "Total",
         "input_image.supported"                            => "Supported formats are .png, .jpg, .jpeg.",
@@ -540,9 +537,7 @@ return [
         "routes_title.page_edit"                           => "Edit Page",
         "routes_title.pages"                               => "Pages",
         "routes_title.profile"                             => "My Profile",
-        "routes_title.profile_settings"                    => "Profile Settings",
         "routes_title.settings"                            => "Settings",
-        "routes_title.settings_mobile"                     => "Settings",
         "routes_title.settings_password"                   => "Change Password",
         "routes_title.settings_storage"                    => "Storage",
         "routes_title.user_create"                         => "Create User",
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b622623a..7ef308b3 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -7,8 +7,8 @@
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js?id=07a5f340da451bf2ae5d",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js?id=319ba6f55c8fb5dca6ac",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js?id=6f6e038b64009a752638",
-    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=21e92b2f7b011b943c69",
-    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=2647be535081392cbdc3",
+    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=371a2ca2f9968d059901",
+    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=f6929d8944f637d6b6f5",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=f779d10bf0f57bf3b08c",
     "/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=075ff381293e1a20d167",
     "/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=5f27527c258dada4aeb9",
@@ -16,18 +16,18 @@
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=22ad87a460950d32721a",
     "/chunks/app-email.js": "/chunks/app-email.js?id=db0423ca77d7b92a1d52",
     "/chunks/app-index.js": "/chunks/app-index.js?id=e3e2403810a4f1fd94e9",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=3e5407ae9576a0edc760",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=153b1a161f7cfb056909",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js?id=5e8dfc5ac3b67b3009f8",
     "/chunks/app-others.js": "/chunks/app-others.js?id=73a4e8a13652e2b7ed83",
     "/chunks/app-payments.js": "/chunks/app-payments.js?id=4b8627cfd6546bd56caa",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=92003b708b3a043078d3",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=b5df623455f8a9948563",
     "/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=c6c12c5a2f5ee26888a3",
     "/chunks/app-setup.js": "/chunks/app-setup.js?id=a0ef7ae0d22e995093d2",
     "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=d0da577903083a891b00",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=1702da1aa1818e97dda1",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=7abdbac43596d1deb664",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=ed92e7337efbd2afaa52",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=a9a199caa6709ebb48f2",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=655032bdcde726ba651f",
     "/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=ef163f8da51054f89d5c",
     "/chunks/database.js": "/chunks/database.js?id=7cf91421350f68985889",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=ffff5333522a1116d856",
@@ -43,27 +43,27 @@
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=daaffc43387587cf4b57",
     "/chunks/homepage.js": "/chunks/homepage.js?id=4395ca4eb2abdbe487c0",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6b17b649280761c01c5a",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=49e5e88b85d0bcfa04c2",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=a5da5e3bad51b3b6b6f1",
     "/chunks/not-found.js": "/chunks/not-found.js?id=e0eb924527b6f9b20e3f",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=23bb8bddee499a6b1061",
-    "/chunks/pages.js": "/chunks/pages.js?id=513b48ab860bfe24bed9",
-    "/chunks/plan.js": "/chunks/plan.js?id=980ecbb2c550ecc08b6d",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=3392652808dff5264c28",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=f9a7101db1d5e67d4921",
+    "/chunks/pages.js": "/chunks/pages.js?id=7b3c7ee8c586e73fe65a",
+    "/chunks/plan.js": "/chunks/plan.js?id=c4cc3da1bedaa9139087",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=99ba24b1200a07e23930",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=bb0d06be8e675c88bd0f",
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=7a6acca368d11e2a4815",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=260d274a422706d71809",
-    "/chunks/plans.js": "/chunks/plans.js?id=6d14bd88ebd6cf82fdc6",
-    "/chunks/platform.js": "/chunks/platform.js?id=653e253110ab4698e4d0",
+    "/chunks/plans.js": "/chunks/plans.js?id=3a736b456df61fbeff28",
+    "/chunks/platform.js": "/chunks/platform.js?id=a4ef043a43d809cbf848",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=d43c6021fdd724a3687d",
     "/chunks/profile.js": "/chunks/profile.js?id=bdc92d734851c0d09b8c",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a5e7ed872d1430177922",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=93ffe6eca4dcafbe8234",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=b35e751cdc1946a4fb60",
-    "/chunks/settings.js": "/chunks/settings.js?id=1a5e37e67eb534cbda1b",
+    "/chunks/settings.js": "/chunks/settings.js?id=b767d471af70548b50f5",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=17428f129a14c15323e5",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=9bf3504a262af35fa997",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=dd27209e827e96b49917",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=e5437f00d24224997f86",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=aa34712346ed9a2fc12d",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=b06d4a1d504b2a6cbeed",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=1bffa4ae7d545af08355",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
     "/chunks/shared.js": "/chunks/shared.js?id=9646958a66d976078352",
@@ -77,17 +77,17 @@
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=0da9ece2d7d853f2bb27",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=a09dc140a3914fb64a1a",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=b49a1f662c7dadee59ac",
-    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=66b9183a2e51801b81a5",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=6a970776608fcd412c7b",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=05a7779a4d6bb2dda84e",
-    "/chunks/user.js": "/chunks/user.js?id=c72518ac51fba4af725d",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=ccbd9c25bb268bb084c8",
+    "/chunks/user.js": "/chunks/user.js?id=75187217022a880b28b4",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=d917fcc7c8202abc01d0",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=4a7ec6133d2e735229aa",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=afa8a3f0f5972909e62a",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=5700c76f6041d7b0ed2d",
     "/chunks/user-password.js": "/chunks/user-password.js?id=de180838609bb88ffe90",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=dc33def6d2b4390869b5",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c6ec1b7215530cfdbceb",
-    "/chunks/users.js": "/chunks/users.js?id=a6a20d23eaef40e24740",
+    "/chunks/users.js": "/chunks/users.js?id=5b0581181239f87643a3",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js?id=5007f400f6b506ab23f4",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js?id=2b11dd8f37c3c2421f2f",
     "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=8f589cb0d5e028068d09",
@@ -250,7 +250,7 @@
     "/chunks/admin~chunks/platform.c4516b2b2826dfd486ed.hot-update.js": "/chunks/admin~chunks/platform.c4516b2b2826dfd486ed.hot-update.js",
     "/chunks/admin~chunks/platform.a5eb84601c7ec9c598f7.hot-update.js": "/chunks/admin~chunks/platform.a5eb84601c7ec9c598f7.hot-update.js",
     "/js/main.6d36f6cecb42b6a6a97a.hot-update.js": "/js/main.6d36f6cecb42b6a6a97a.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=4145c54ff64f420b266f",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=df05c33ce85918c5b207",
     "/chunks/admin~chunks/platform.6d36f6cecb42b6a6a97a.hot-update.js": "/chunks/admin~chunks/platform.6d36f6cecb42b6a6a97a.hot-update.js",
     "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.6d36f6cecb42b6a6a97a.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.6d36f6cecb42b6a6a97a.hot-update.js",
     "/chunks/admin~chunks/platform.0a163987dacd5443283a.hot-update.js": "/chunks/admin~chunks/platform.0a163987dacd5443283a.hot-update.js",
@@ -274,5 +274,75 @@
     "/chunks/admin~chunks/platform.4f0f8c9610cddaded31e.hot-update.js": "/chunks/admin~chunks/platform.4f0f8c9610cddaded31e.hot-update.js",
     "/chunks/admin~chunks/platform.0928091f0d152de0b93d.hot-update.js": "/chunks/admin~chunks/platform.0928091f0d152de0b93d.hot-update.js",
     "/chunks/admin~chunks/platform.e9aa84461f9fdb6800a8.hot-update.js": "/chunks/admin~chunks/platform.e9aa84461f9fdb6800a8.hot-update.js",
-    "/chunks/admin~chunks/platform.cb8e3def1e6c3a9e92ee.hot-update.js": "/chunks/admin~chunks/platform.cb8e3def1e6c3a9e92ee.hot-update.js"
+    "/chunks/admin~chunks/platform.cb8e3def1e6c3a9e92ee.hot-update.js": "/chunks/admin~chunks/platform.cb8e3def1e6c3a9e92ee.hot-update.js",
+    "/chunks/admin~chunks/platform.3fcbc35f8b1f3d1f7d58.hot-update.js": "/chunks/admin~chunks/platform.3fcbc35f8b1f3d1f7d58.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.f99ad9d179152dc207ed.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.f99ad9d179152dc207ed.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.088bae89aeb1cf2d331e.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.088bae89aeb1cf2d331e.hot-update.js",
+    "/chunks/admin~chunks/platform.7ac0b926a75933abd313.hot-update.js": "/chunks/admin~chunks/platform.7ac0b926a75933abd313.hot-update.js",
+    "/chunks/admin~chunks/platform.fd5ba05fc31cd75630bf.hot-update.js": "/chunks/admin~chunks/platform.fd5ba05fc31cd75630bf.hot-update.js",
+    "/chunks/admin~chunks/platform.9b248fdd11afde3125a4.hot-update.js": "/chunks/admin~chunks/platform.9b248fdd11afde3125a4.hot-update.js",
+    "/chunks/admin~chunks/platform.f5ceb3923191e47b6117.hot-update.js": "/chunks/admin~chunks/platform.f5ceb3923191e47b6117.hot-update.js",
+    "/chunks/admin~chunks/platform.8c9ab604f79aa7771ded.hot-update.js": "/chunks/admin~chunks/platform.8c9ab604f79aa7771ded.hot-update.js",
+    "/js/main.c4c59ba526b4f422a38f.hot-update.js": "/js/main.c4c59ba526b4f422a38f.hot-update.js",
+    "/chunks/admin~chunks/platform.c4c59ba526b4f422a38f.hot-update.js": "/chunks/admin~chunks/platform.c4c59ba526b4f422a38f.hot-update.js",
+    "/chunks/admin~chunks/platform.c715a7a2d5145539bafa.hot-update.js": "/chunks/admin~chunks/platform.c715a7a2d5145539bafa.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8e38e5dc39c1a1a0cf3f.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8e38e5dc39c1a1a0cf3f.hot-update.js",
+    "/chunks/admin~chunks/platform.8e38e5dc39c1a1a0cf3f.hot-update.js": "/chunks/admin~chunks/platform.8e38e5dc39c1a1a0cf3f.hot-update.js",
+    "/chunks/admin~chunks/platform.0d2cdc802da3e616d149.hot-update.js": "/chunks/admin~chunks/platform.0d2cdc802da3e616d149.hot-update.js",
+    "/chunks/admin~chunks/platform.2c20282f6abe06228749.hot-update.js": "/chunks/admin~chunks/platform.2c20282f6abe06228749.hot-update.js",
+    "/chunks/admin~chunks/platform.7c74a7a14f293a0f3ac3.hot-update.js": "/chunks/admin~chunks/platform.7c74a7a14f293a0f3ac3.hot-update.js",
+    "/chunks/admin~chunks/platform.eb7458d12710629cfd84.hot-update.js": "/chunks/admin~chunks/platform.eb7458d12710629cfd84.hot-update.js",
+    "/chunks/admin~chunks/platform.e8f4896c2a65690b1466.hot-update.js": "/chunks/admin~chunks/platform.e8f4896c2a65690b1466.hot-update.js",
+    "/chunks/admin~chunks/platform.3993c8673babcdf3d90b.hot-update.js": "/chunks/admin~chunks/platform.3993c8673babcdf3d90b.hot-update.js",
+    "/chunks/admin~chunks/platform.8f8e61abb03c4f4e6c19.hot-update.js": "/chunks/admin~chunks/platform.8f8e61abb03c4f4e6c19.hot-update.js",
+    "/chunks/admin~chunks/platform.c434add44a4cd496609d.hot-update.js": "/chunks/admin~chunks/platform.c434add44a4cd496609d.hot-update.js",
+    "/chunks/admin~chunks/platform.a3d959d2cbe4b424d6c3.hot-update.js": "/chunks/admin~chunks/platform.a3d959d2cbe4b424d6c3.hot-update.js",
+    "/chunks/admin~chunks/platform.9a3da0e2c311189016b4.hot-update.js": "/chunks/admin~chunks/platform.9a3da0e2c311189016b4.hot-update.js",
+    "/chunks/admin~chunks/platform.c56f8d1eea503116b129.hot-update.js": "/chunks/admin~chunks/platform.c56f8d1eea503116b129.hot-update.js",
+    "/chunks/admin~chunks/platform.bf570cb5fe93d457de34.hot-update.js": "/chunks/admin~chunks/platform.bf570cb5fe93d457de34.hot-update.js",
+    "/chunks/admin~chunks/platform.9e9a6ac5e5075222d52f.hot-update.js": "/chunks/admin~chunks/platform.9e9a6ac5e5075222d52f.hot-update.js",
+    "/chunks/admin~chunks/platform.42ae47ec34a42ee4cd2c.hot-update.js": "/chunks/admin~chunks/platform.42ae47ec34a42ee4cd2c.hot-update.js",
+    "/chunks/admin~chunks/platform.835c8b4d51a833c9823a.hot-update.js": "/chunks/admin~chunks/platform.835c8b4d51a833c9823a.hot-update.js",
+    "/chunks/admin~chunks/platform.f9f36b959374112ef23f.hot-update.js": "/chunks/admin~chunks/platform.f9f36b959374112ef23f.hot-update.js",
+    "/chunks/admin~chunks/platform.23416efa19bddf4d949f.hot-update.js": "/chunks/admin~chunks/platform.23416efa19bddf4d949f.hot-update.js",
+    "/chunks/admin~chunks/platform.ec01dfe02702b4f0b89b.hot-update.js": "/chunks/admin~chunks/platform.ec01dfe02702b4f0b89b.hot-update.js",
+    "/chunks/admin~chunks/platform.f86bb1900ea1517ea85c.hot-update.js": "/chunks/admin~chunks/platform.f86bb1900ea1517ea85c.hot-update.js",
+    "/chunks/admin~chunks/platform.24e35089c882c720362f.hot-update.js": "/chunks/admin~chunks/platform.24e35089c882c720362f.hot-update.js",
+    "/chunks/admin~chunks/platform.91d32318fcb024df1c7c.hot-update.js": "/chunks/admin~chunks/platform.91d32318fcb024df1c7c.hot-update.js",
+    "/chunks/admin~chunks/platform.0bcb145f893d2325bc48.hot-update.js": "/chunks/admin~chunks/platform.0bcb145f893d2325bc48.hot-update.js",
+    "/chunks/admin~chunks/platform.35ff8f473d9b777869f8.hot-update.js": "/chunks/admin~chunks/platform.35ff8f473d9b777869f8.hot-update.js",
+    "/chunks/admin~chunks/platform.bdb489d999f6a2527077.hot-update.js": "/chunks/admin~chunks/platform.bdb489d999f6a2527077.hot-update.js",
+    "/chunks/admin~chunks/platform.b928200ac61fee97c300.hot-update.js": "/chunks/admin~chunks/platform.b928200ac61fee97c300.hot-update.js",
+    "/chunks/admin~chunks/platform.8189f8021be761243530.hot-update.js": "/chunks/admin~chunks/platform.8189f8021be761243530.hot-update.js",
+    "/chunks/admin~chunks/platform.bdad831b4a0d5a5a04b4.hot-update.js": "/chunks/admin~chunks/platform.bdad831b4a0d5a5a04b4.hot-update.js",
+    "/js/main.98eba8d251fcd31edad4.hot-update.js": "/js/main.98eba8d251fcd31edad4.hot-update.js",
+    "/js/main.216cd903e752d4024980.hot-update.js": "/js/main.216cd903e752d4024980.hot-update.js",
+    "/js/main.0a0a26b603d33e82fcdf.hot-update.js": "/js/main.0a0a26b603d33e82fcdf.hot-update.js",
+    "/chunks/app-language.0a0a26b603d33e82fcdf.hot-update.js": "/chunks/app-language.0a0a26b603d33e82fcdf.hot-update.js",
+    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=2551061f37c2a8056921",
+    "/chunks/profile~chunks/settings-password.0a0a26b603d33e82fcdf.hot-update.js": "/chunks/profile~chunks/settings-password.0a0a26b603d33e82fcdf.hot-update.js",
+    "/chunks/settings.0a0a26b603d33e82fcdf.hot-update.js": "/chunks/settings.0a0a26b603d33e82fcdf.hot-update.js",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.0a0a26b603d33e82fcdf.hot-update.js": "/chunks/upgrade-billing~chunks/upgrade-plan.0a0a26b603d33e82fcdf.hot-update.js",
+    "/js/main.b6c421b5aa72da94e462.hot-update.js": "/js/main.b6c421b5aa72da94e462.hot-update.js",
+    "/chunks/admin~chunks/platform.242aafcde4ae3256e72c.hot-update.js": "/chunks/admin~chunks/platform.242aafcde4ae3256e72c.hot-update.js",
+    "/chunks/admin~chunks/platform.8a10f4d1d6027112212e.hot-update.js": "/chunks/admin~chunks/platform.8a10f4d1d6027112212e.hot-update.js",
+    "/chunks/admin~chunks/platform.597375babbeb79266012.hot-update.js": "/chunks/admin~chunks/platform.597375babbeb79266012.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.ea589dab18f8b3de602a.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.ea589dab18f8b3de602a.hot-update.js",
+    "/chunks/admin~chunks/platform.ea589dab18f8b3de602a.hot-update.js": "/chunks/admin~chunks/platform.ea589dab18f8b3de602a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.d61857258d216f972296.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.d61857258d216f972296.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.aea5ba94193e647a8147.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.aea5ba94193e647a8147.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.200b308b9668a97e28ff.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.200b308b9668a97e28ff.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.301e12d2c35674dec3c9.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.301e12d2c35674dec3c9.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8848a35f55eb6144a00a.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8848a35f55eb6144a00a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.9050011eb0caee977a42.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.9050011eb0caee977a42.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.72ae05efe1aa6f014893.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.72ae05efe1aa6f014893.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.e56b699addfe3edda5d8.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.e56b699addfe3edda5d8.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.27e7b5eef3ea3b67b70b.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.27e7b5eef3ea3b67b70b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.51add83b80c729d193d3.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.51add83b80c729d193d3.hot-update.js",
+    "/chunks/admin~chunks/platform.af86a0e3b7d16d64049a.hot-update.js": "/chunks/admin~chunks/platform.af86a0e3b7d16d64049a.hot-update.js",
+    "/chunks/admin~chunks/platform.eef65fdee28b40a46b29.hot-update.js": "/chunks/admin~chunks/platform.eef65fdee28b40a46b29.hot-update.js",
+    "/chunks/platform.9e7738e5f5875041d4a3.hot-update.js": "/chunks/platform.9e7738e5f5875041d4a3.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.c6c4ee94a52674f7a19e.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.c6c4ee94a52674f7a19e.hot-update.js",
+    "/chunks/admin~chunks/platform.2b7aba86eb436dd15e06.hot-update.js": "/chunks/admin~chunks/platform.2b7aba86eb436dd15e06.hot-update.js",
+    "/chunks/platform.867f74b98b09aba43464.hot-update.js": "/chunks/platform.867f74b98b09aba43464.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileFilterMobile.vue b/resources/js/components/FilesView/FileFilterMobile.vue
index 1a3d861c..ee6b34f2 100644
--- a/resources/js/components/FilesView/FileFilterMobile.vue
+++ b/resources/js/components/FilesView/FileFilterMobile.vue
@@ -2,13 +2,13 @@
     <MenuMobile name="file-filter">
         <MenuMobileGroup>
             <OptionGroup>
-                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" :is-active="$isThisLocation('base')" />
-                <Option @click.native="goToLatest" :title="$t('menu.latest')" icon="upload-cloud" :is-active="$isThisLocation('latest')" />
-                <Option @click.native="goToTrash" :title="$t('menu.trash')" icon="trash" :is-active="$isThisLocation(['trash', 'trash-root'])" />
+                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" :is-active="$isThisLocation('base')" is-hover-disabled="true" />
+                <Option @click.native="goToLatest" :title="$t('menu.latest')" icon="upload-cloud" :is-active="$isThisLocation('latest')" is-hover-disabled="true" />
+                <Option @click.native="goToTrash" :title="$t('menu.trash')" icon="trash" :is-active="$isThisLocation(['trash', 'trash-root'])" is-hover-disabled="true" />
             </OptionGroup>
             <OptionGroup>
-                <Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisLocation('shared')" />
-                <Option @click.native="goToParticipantUploads" :title="$t('sidebar.participant_uploads')" icon="users" :is-active="$isThisLocation('participant_uploads')" />
+                <Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisLocation('shared')" is-hover-disabled="true" />
+                <Option @click.native="goToParticipantUploads" :title="$t('sidebar.participant_uploads')" icon="users" :is-active="$isThisLocation('participant_uploads')" is-hover-disabled="true" />
             </OptionGroup>
         </MenuMobileGroup>
     </MenuMobile>
@@ -20,7 +20,6 @@ import OptionGroup from '@/components/FilesView/OptionGroup'
 import MenuMobile from '@/components/Mobile/MenuMobile'
 import Option from '@/components/FilesView/Option'
 import {mapGetters} from 'vuex'
-import {events} from '@/bus'
 
 export default {
     name: 'FileMenuMobile',
@@ -58,7 +57,7 @@ export default {
         goToParticipantUploads() {
             this.$store.dispatch('getParticipantUploads')
             this.flushBrowseHistory()
-        },
+        }
     }
 }
 </script>
diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue
index 11e695a7..99f65ae9 100644
--- a/resources/js/components/FilesView/Option.vue
+++ b/resources/js/components/FilesView/Option.vue
@@ -1,6 +1,6 @@
 <template>
-    <li class="menu-option group">
-        <div class="icon group-hover-text-theme">
+    <li class="menu-option group" :class="{'hover-disabled': isHoverDisabled}">
+        <div class="icon-left group-hover-text-theme">
             <calendar-icon v-if="icon === 'calendar'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <grid-icon v-if="icon === 'grid'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <list-icon v-if="icon === 'list'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
@@ -24,16 +24,35 @@
             <user-icon v-if="icon === 'user'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <settings-icon v-if="icon === 'settings'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <power-icon v-if="icon === 'power'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <lock-icon v-if="icon === 'lock'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <cloud-icon v-if="icon === 'cloud'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <credit-card-icon v-if="icon === 'credit-card'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <file-text-icon v-if="icon === 'file-text'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <database-icon v-if="icon === 'database'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <globe-icon v-if="icon === 'globe'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <monitor-icon v-if="icon === 'monitor'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <box-icon v-if="icon === 'box'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
         </div>
         <div class="text-label group-hover-text-theme" :class="{'text-theme': isActive}">
             {{ title }}
         </div>
+        <div v-if="isArrowRight" class="icon-right group-hover-text-theme">
+            <chevron-right-icon size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+        </div>
     </li>
 </template>
 
 <script>
 import AlphabetIcon from '@/components/FilesView/Icons/AlphabetIcon'
 import {
+    ChevronRightIcon,
+    BoxIcon,
+    MonitorIcon,
+    GlobeIcon,
+    FileTextIcon,
+    CreditCardIcon,
+    CloudIcon,
+    LockIcon,
     PowerIcon,
     SettingsIcon,
     UsersIcon,
@@ -55,16 +74,28 @@ import {
     GridIcon,
     ListIcon,
     CalendarIcon,
+    DatabaseIcon,
 } from 'vue-feather-icons'
 
     export default {
         name: 'Option',
         props:[
+            'isHoverDisabled',
+            'isArrowRight',
             'isActive',
             'title',
             'icon'
         ],
         components: {
+            BoxIcon,
+            MonitorIcon,
+            GlobeIcon,
+            DatabaseIcon,
+            ChevronRightIcon,
+            FileTextIcon,
+            CreditCardIcon,
+            CloudIcon,
+            LockIcon,
             CornerDownRightIcon,
             DownloadCloudIcon,
             UploadCloudIcon,
@@ -106,7 +137,21 @@ import {
     display: flex;
     align-items: center;
 
-    .icon {
+    .icon-right {
+        vertical-align: middle;
+        text-align: right;
+        width: 100%;
+
+        svg {
+            @include transform(translateY(3px));
+        }
+
+        polyline {
+            color: inherit;
+        }
+    }
+
+    .icon-left {
         margin-right: 20px;
         line-height: 0;
 
@@ -124,10 +169,11 @@ import {
         @include font-size(16);
     }
 
-    &:hover {
+    &:hover:not(.hover-disabled) {
         background: $light_background;
     }
 }
+
 @media (prefers-color-scheme: dark) {
 
     .menu-option {
diff --git a/resources/js/components/Mobile/MenuItemList.vue b/resources/js/components/Mobile/MenuItemList.vue
deleted file mode 100644
index 42eab117..00000000
--- a/resources/js/components/Mobile/MenuItemList.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-    <ul class="link-group">
-        <li @click="goToItem(link)" v-for="(link, i) in navigation" :key="i" v-if="link.isVisible" :class="link.icon" class="link-item">
-            <div class="menu-icon">
-                <hard-drive-icon v-if="link.icon === 'hard-drive'" size="17" />
-                <share-icon v-if="link.icon === 'share'" size="17" />
-                <trash2-icon v-if="link.icon === 'trash'" size="17" />
-                <power-icon v-if="link.icon === 'power'" size="17" />
-                <settings-icon v-if="link.icon === 'settings'" size="17" />
-                <upload-cloud-icon v-if="link.icon === 'latest'" size="17" />
-                <user-icon v-if="link.icon === 'user'" size="17" />
-                <users-icon v-if="link.icon === 'users'" size="17" />
-                <lock-icon v-if="link.icon === 'lock'" size="17" />
-                <file-text-icon v-if="link.icon === 'file-text'" size="17" />
-                <database-icon v-if="link.icon === 'database'" size="17" />
-                <credit-card-icon v-if="link.icon === 'credit-card'" size="17" />
-                <cloud-icon v-if="link.icon === 'cloud'" size="17" />
-                <monitor-icon v-if="link.icon === 'monitor'" size="17" />
-                <box-icon v-if="link.icon === 'box'" size="17" />
-                <globe-icon v-if="link.icon === 'language'" size="17" />
-            </div>
-            <b class="menu-link">
-                <span>{{ link.title }}</span>
-                <chevron-right-icon size="15" class="arrow-right"/>
-            </b>
-        </li>
-    </ul>
-</template>
-
-<script>
-    import {
-        ChevronRightIcon,
-        UploadCloudIcon,
-        CreditCardIcon,
-        HardDriveIcon,
-        FileTextIcon,
-        SettingsIcon,
-        DatabaseIcon,
-        MonitorIcon,
-        Trash2Icon,
-        CloudIcon,
-        PowerIcon,
-        GlobeIcon,
-        ShareIcon,
-        UsersIcon,
-        UserIcon,
-        LockIcon,
-        BoxIcon,
-    } from 'vue-feather-icons'
-
-    export default {
-        name: 'MenuItemList',
-        components: {
-            BoxIcon,
-            MonitorIcon,
-            ChevronRightIcon,
-            UploadCloudIcon,
-            CreditCardIcon,
-            HardDriveIcon,
-            DatabaseIcon,
-            FileTextIcon,
-            SettingsIcon,
-            Trash2Icon,
-            CloudIcon,
-            PowerIcon,
-            GlobeIcon,
-            UsersIcon,
-            ShareIcon,
-            LockIcon,
-            UserIcon,
-        },
-        props: [
-            'navigation'
-        ],
-        methods: {
-            goToItem(link) {
-                this.$emit('menu', link.icon)
-
-                // Go to next route
-                if (link.routeName !== this.$route.name)
-                    this.$router.push({name: link.routeName})
-            }
-        }
-    }
-</script>
-
-<style scoped lang="scss">
-    @import '@assets/vuefilemanager/_variables';
-    @import '@assets/vuefilemanager/_mixins';
-
-    .link-item {
-        display: flex;
-        text-decoration: none;
-        padding: 17px 0;
-        width: 100%;
-
-        .menu-icon {
-            display: block;
-            margin-right: 20px;
-
-            svg {
-                margin-top: -1px;
-                vertical-align: middle;
-            }
-
-            path, line, polyline, rect, circle, ellipse {
-                stroke: $text;
-            }
-        }
-
-        .menu-link {
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            color: $text;
-
-            span {
-                @include font-size(14);
-            }
-        }
-    }
-
-    @media (prefers-color-scheme: dark) {
-        .link-item {
-
-            .menu-icon {
-
-                path, line, polyline, rect, circle, ellipse {
-                    stroke: $dark_mode_text_primary;
-                }
-            }
-
-            .menu-link {
-                color: $dark_mode_text_primary;
-            }
-        }
-    }
-
-</style>
diff --git a/resources/js/components/Mobile/MenuMobile.vue b/resources/js/components/Mobile/MenuMobile.vue
index 43925db2..5d83c7e0 100644
--- a/resources/js/components/Mobile/MenuMobile.vue
+++ b/resources/js/components/Mobile/MenuMobile.vue
@@ -61,12 +61,12 @@
     // Transition
     .context-menu-enter-active,
     .fade-enter-active {
-        transition: all 200ms;
+        transition: all 300ms;
     }
 
     .context-menu-leave-active,
     .fade-leave-active {
-        transition: all 200ms;
+        transition: all 300ms;
     }
 
     .fade-enter,
diff --git a/resources/js/components/Others/MobileNavigation.vue b/resources/js/components/Others/MobileNavigation.vue
index 72c07d59..65a5bbec 100644
--- a/resources/js/components/Others/MobileNavigation.vue
+++ b/resources/js/components/Others/MobileNavigation.vue
@@ -1,13 +1,51 @@
 <template>
     <MenuMobile name="user-navigation">
-        <UserHeadline class="user-info" />
 
+        <!--User avatar-->
+        <UserHeadline v-if="!clickedSubmenu" class="user-info" />
+
+        <!--Go back button-->
+        <div v-if="clickedSubmenu" @click.stop="showSubmenu(undefined)" class="go-back">
+            <chevron-left-icon size="19" class="text-theme" />
+            <span class="title text-theme">{{ backTitle }}</span>
+        </div>
+
+        <!--Menu links-->
         <MenuMobileGroup>
-            <OptionGroup>
-                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" />
-                <Option @click.native="showUserProfileMenu" :title="$t('menu.settings')" icon="user" />
-                <Option @click.native="goToAdmin" :title="$t('menu.admin')" icon="settings" v-if="isAdmin" />
-                <Option @click.native="logOut" :title="$t('menu.logout')" icon="power" />
+
+            <!--Main navigation-->
+            <OptionGroup v-if="!clickedSubmenu">
+                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" is-hover-disabled="true"/>
+                <Option @click.native.stop="showSubmenu('settings')" :title="$t('menu.settings')" icon="user" :is-arrow-right="true" is-hover-disabled="true"/>
+                <Option v-if="isAdmin" @click.native.stop="showSubmenu('admin')" :title="$t('menu.admin')" icon="settings" :is-arrow-right="true" is-hover-disabled="true"/>
+            </OptionGroup>
+            <OptionGroup v-if="!clickedSubmenu">
+                <Option @click.native="logOut" :title="$t('menu.logout')" icon="power" is-hover-disabled="true" />
+            </OptionGroup>
+
+            <!--Submenu: User settings-->
+            <OptionGroup v-if="clickedSubmenu === 'settings'">
+                <Option @click.native="goToRoute('Profile')" :title="$t('menu.profile')" icon="user" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Storage')" :title="$t('menu.storage')" icon="hard-drive" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Password')" :title="$t('menu.password')" icon="lock" is-hover-disabled="true" />
+            </OptionGroup>
+            <OptionGroup v-if="clickedSubmenu === 'settings' && config.isSaaS">
+                <Option v-if="" @click.native="goToRoute('Subscription')" :title="$t('menu.subscription')" icon="cloud" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('PaymentMethods')" :title="$t('menu.payment_cards')" icon="credit-card" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Invoice')" :title="$t('menu.invoices')" icon="file-text" is-hover-disabled="true" />
+            </OptionGroup>
+
+            <!--Submenu: Admin settings-->
+            <OptionGroup v-if="clickedSubmenu === 'admin'">
+                <Option @click.native="goToRoute('Dashboard')" :title="$t('admin_menu.dashboard')" icon="box" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Users')" :title="$t('admin_menu.users')" icon="users" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('AppOthers')" :title="$t('admin_menu.settings')" icon="settings" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Pages')" :title="$t('admin_menu.pages')" icon="monitor" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Language')" :title="$t('languages')" icon="globe" is-hover-disabled="true" />
+            </OptionGroup>
+            <OptionGroup v-if="clickedSubmenu === 'admin' && config.isSaaS">
+                <Option v-if="" @click.native="goToRoute('Plans')" :title="$t('admin_menu.plans')" icon="database" is-hover-disabled="true" />
+                <Option @click.native="goToRoute('Invoices')" :title="$t('admin_menu.invoices')" icon="file-text" is-hover-disabled="true" />
             </OptionGroup>
         </MenuMobileGroup>
     </MenuMobile>
@@ -19,11 +57,13 @@
     import UserHeadline from '@/components/Sidebar/UserHeadline'
     import MenuMobile from '@/components/Mobile/MenuMobile'
     import Option from '@/components/FilesView/Option'
+    import {ChevronLeftIcon} from 'vue-feather-icons'
     import {mapGetters} from 'vuex'
 
     export default {
         name: 'MobileNavigation',
         components: {
+            ChevronLeftIcon,
             MenuMobileGroup,
             UserHeadline,
             OptionGroup,
@@ -33,21 +73,39 @@
         computed: {
             ...mapGetters([
                 'homeDirectory',
+                'config',
                 'user',
             ]),
             isAdmin() {
                 return this.user && this.user.data.attributes.role === 'admin'
+            },
+            backTitle() {
+                let location = {
+                    'settings': this.$t('menu.settings'),
+                    'admin': this.$t('menu.admin')
+                }
+
+                return 'Go back from ' + location[this.clickedSubmenu]
+            }
+        },
+        data() {
+            return {
+                clickedSubmenu: undefined,
             }
         },
         methods: {
+            goToRoute(route) {
+                this.$router.push({name: route})
+                this.clickedSubmenu = undefined
+            },
+            showSubmenu(name) {
+                this.clickedSubmenu = name
+            },
             goToFiles() {
+                if (this.$route.name !== 'Files')
+                    this.$router.push({name: 'Files'})
+
                 this.$store.dispatch('getFolder', [{folder: this.homeDirectory, back: false, init: true}])
-            },
-            showUserProfileMenu() {
-
-            },
-            goToAdmin() {
-
             },
             logOut() {
                 this.$store.dispatch('logOut')
@@ -57,8 +115,27 @@
 </script>
 
 <style scoped lang="scss">
+    @import "@assets/vuefilemanager/_variables";
+    @import "@assets/vuefilemanager/_mixins";
 
     .user-info {
         padding: 20px 20px 10px;
     }
+
+    .go-back {
+        display: flex;
+        align-items: center;
+        padding: 30px 20px 10px;
+        cursor: pointer;
+
+        .title {
+            @include font-size(14);
+            font-weight: 700;
+            margin-left: 10px;
+        }
+
+        polyline {
+            color: inherit;
+        }
+    }
 </style>
diff --git a/resources/js/router.js b/resources/js/router.js
index b5620211..3edf4294 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -1,11 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import i18n from '@/i18n/index'
 import store from './store/index'
 
-import AdminMobileMenu from './views/Mobile/AdminMobileMenu'
-import UserProfileMobileMenu from './views/Mobile/UserProfileMobileMenu'
-
 Vue.use(Router)
 
 const routesAdmin = [
@@ -296,24 +292,6 @@ const routesAdmin = [
             }
         ]
     },
-    {
-        name: 'AdminMobileMenu',
-        path: '/admin-menu',
-        component: AdminMobileMenu,
-        meta: {
-            requiresAuth: true,
-            title: 'routes_title.settings_mobile'
-        },
-    },
-    {
-        name: 'UserProfileMobileMenu',
-        path: '/user-menu',
-        component: UserProfileMobileMenu,
-        meta: {
-            requiresAuth: true,
-            title: 'routes_title.profile_settings'
-        },
-    },
 ]
 const routesShared = [
     {
diff --git a/resources/js/views/Mobile/AdminMobileMenu.vue b/resources/js/views/Mobile/AdminMobileMenu.vue
deleted file mode 100644
index b7f1ea18..00000000
--- a/resources/js/views/Mobile/AdminMobileMenu.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-    <div id="single-page">
-        <div id="page-content">
-
-            <!--Header-->
-            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
-
-            <!--Content-->
-            <div class="content-page">
-                <nav class="mobile-navigation">
-
-                    <!--Admin menu-->
-                    <b class="mobile-menu-label">{{ $t('global.admin') }}</b>
-                    <MenuItemList :navigation="AdminNavigation" />
-
-                    <!--SaaS menu-->
-                    <b v-if="config.isSaaS" class="mobile-menu-label">{{ $t('global.saas') }}</b>
-                    <MenuItemList v-if="config.isSaaS" :navigation="SassNavigation" />
-                </nav>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    import MenuItemList from '@/components/Mobile/MenuItemList'
-    import MobileHeader from '@/components/Mobile/MobileHeader'
-    import { mapGetters } from 'vuex'
-
-    export default {
-        name: 'AdminMobileMenu',
-        components: {
-            MenuItemList,
-            MobileHeader,
-        },
-        computed: {
-            ...mapGetters(['config']),
-        },
-        data() {
-            return {
-                AdminNavigation: [
-                    {
-                        icon: 'box',
-                        title: this.$t('admin_menu.dashboard'),
-                        routeName: 'Dashboard',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'users',
-                        title: this.$t('admin_menu.users'),
-                        routeName: 'Users',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'settings',
-                        title: this.$t('admin_menu.settings'),
-                        routeName: 'AppOthers',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'monitor',
-                        title: this.$t('admin_menu.pages'),
-                        routeName: 'Pages',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'language',
-                        title: this.$t('languages'),
-                        routeName: 'Language',
-                        isVisible: true,
-
-                    }
-                ],
-                SassNavigation: [
-                    {
-                        icon: 'database',
-                        title: this.$t('admin_menu.plans'),
-                        routeName: 'Plans',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'file-text',
-                        title: this.$t('admin_menu.invoices'),
-                        routeName: 'Invoices',
-                        isVisible: true,
-                    },
-                ]
-            }
-        },
-    }
-</script>
-
-<style scoped lang="scss">
-    @import '@assets/vuefilemanager/_variables';
-    @import '@assets/vuefilemanager/_mixins';
-
-    .mobile-navigation {
-        width: 100%;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 99;
-
-        .mobile-menu-label {
-            margin-top: 30px;
-            margin-bottom: 5px;
-            @include font-size(11);
-            color: $text-muted;
-            display: block;
-
-            &:first-child {
-                margin-top: 0;
-            }
-        }
-    }
-
-    @media (prefers-color-scheme: dark) {
-        .mobile-navigation {
-
-            .mobile-menu-label {
-                color: $dark_mode_text_secondary;
-            }
-        }
-    }
-</style>
diff --git a/resources/js/views/Mobile/UserProfileMobileMenu.vue b/resources/js/views/Mobile/UserProfileMobileMenu.vue
deleted file mode 100644
index a7f01a5c..00000000
--- a/resources/js/views/Mobile/UserProfileMobileMenu.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-    <div id="single-page">
-        <div id="page-content">
-
-            <!--Header-->
-            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
-
-            <!--Content-->
-            <div class="content-page">
-                <nav class="mobile-navigation">
-
-                    <!--Admin menu-->
-                    <b class="mobile-menu-label">{{ $t('global.menu') }}</b>
-                    <MenuItemList :navigation="ProfileNavigation" />
-
-                    <!--SaaS menu-->
-                    <b class="mobile-menu-label">{{ $t('global.subscription') }}</b>
-                    <MenuItemList :navigation="SubscriptionNavigation" />
-                </nav>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    import MenuItemList from '@/components/Mobile/MenuItemList'
-    import MobileHeader from '@/components/Mobile/MobileHeader'
-
-    export default {
-        name: 'UserProfileMobileMenu',
-        components: {
-            MenuItemList,
-            MobileHeader,
-        },
-        data() {
-            return {
-                ProfileNavigation: [
-                    {
-                        icon: 'user',
-                        title: this.$t('menu.profile'),
-                        routeName: 'Profile',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'hard-drive',
-                        title: this.$t('menu.storage'),
-                        routeName: 'Storage',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'lock',
-                        title: this.$t('menu.password'),
-                        routeName: 'Password',
-                        isVisible: true,
-                    },
-                ],
-                SubscriptionNavigation: [
-                    {
-                        icon: 'cloud',
-                        title: this.$t('menu.subscription'),
-                        routeName: 'Subscription',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'credit-card',
-                        title: this.$t('menu.payment_cards'),
-                        routeName: 'PaymentMethods',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'file-text',
-                        title: this.$t('menu.invoices'),
-                        routeName: 'Invoice',
-                        isVisible: true,
-                    },
-                ]
-            }
-        },
-    }
-</script>
-
-<style scoped lang="scss">
-    @import '@assets/vuefilemanager/_variables';
-    @import '@assets/vuefilemanager/_mixins';
-
-    .mobile-navigation {
-        width: 100%;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 99;
-
-        .mobile-menu-label {
-            margin-top: 30px;
-            margin-bottom: 5px;
-            @include font-size(11);
-            color: $text-muted;
-            display: block;
-
-            &:first-child {
-                margin-top: 0;
-            }
-        }
-    }
-
-    @media (prefers-color-scheme: dark) {
-        .mobile-navigation {
-
-            .mobile-menu-label {
-                color: $dark_mode_text_secondary;
-            }
-        }
-    }
-</style>
diff --git a/resources/views/vuefilemanager/others/color-template.blade.php b/resources/views/vuefilemanager/others/color-template.blade.php
index 439235c5..69915ce4 100644
--- a/resources/views/vuefilemanager/others/color-template.blade.php
+++ b/resources/views/vuefilemanager/others/color-template.blade.php
@@ -5,7 +5,7 @@
         @endphp
 
         {{-- Group options --}}
-        .group:hover .group-hover-text-theme {color: {{ $color }} !important;}
+        .group:hover:not(.hover-disabled) .group-hover-text-theme {color: {{ $color }} !important;}
 
 
         {{-- Single option --}}