diff --git a/config/language-translations.php b/config/language-translations.php
index eb31a873..a01a3c80 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -306,7 +306,7 @@ return [
         'admin_settings.email.username'                      => 'Mail Username',
         'admin_settings.email.username_plac'                 => 'Type your mail username',
         'admin_settings.others.allow_registration'           => 'Allow User Registration',
-        'admin_settings.others.allow_registration_help'      => 'You can disable public registration for new users. You will still able to <br/>create new users in administration panel.',
+        'admin_settings.others.allow_registration_help'      => 'You can disable public registration for new users. You will still able to create new users in administration panel.',
         'admin_settings.others.allow_user_verification'      => 'Allow User Email Verification',
         'admin_settings.others.allow_user_verification_help' => 'Turn on, if you want to allow user email verification.',
         'admin_settings.others.cache_clear'                  => 'Clear Cache',
@@ -324,7 +324,7 @@ return [
         'admin_settings.others.section_others'               => 'Others Settings',
         'admin_settings.others.section_user'                 => 'Users and Storage',
         'admin_settings.others.storage_limit'                => 'Storage Limitation',
-        'admin_settings.others.storage_limit_help'           => "If this value is off, all users will have infinity storage capacity and you won't be <br/>able to charge your users for storage plan.",
+        'admin_settings.others.storage_limit_help'           => "If this value is off, all users will have infinity storage capacity and you won't be able to charge your users for storage plan.",
         'admin_settings.others.upload_limit'                 => 'Upload Limit',
         'admin_settings.others.upload_limit_help'            => 'If you want to set max file size limit on single upload, add size of your limit in MB. E.g. 100 means 100 MB and 2 000 means 2 000 MB limit.',
         'admin_settings.others.upload_limit_plac'            => 'Type your upload limit in MB',
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 765ecb6b..9771be2f 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,43 +2,43 @@
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
     "/css/tailwind.css": "/css/tailwind.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=be1c010006b71bcaf568",
+    "/chunks/admin.js": "/chunks/admin.js?id=fc16c6e0bf28ebc73598",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=6e28465565ea92af804f",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=b315e8dcb5e79c1c8e7c",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=c98a1e4ceac958cb5bff",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~a2d1c36e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~a2d1c36e.js?id=bbdda6115aa358c2209e",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js?id=08ee54ab4c19d49dc342",
     "/chunks/admin~chunks/app-language~chunks/files~chunks/my-shared-items~chunks/pages~chunks/plans~chunk~31d2e0e5.js": "/chunks/admin~chunks/app-language~chunks/files~chunks/my-shared-items~chunks/pages~chunks/plans~chunk~31d2e0e5.js?id=45350439fb9bcb879f5b",
     "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js?id=c6c725d13c180d43632a",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=34845d890e9e65d2adc0",
-    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=41e0723e62e5d0d133fd",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=8da02dcc87f434aca532",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=3d3f164e568760d8a9cf",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=3f11fe45f7b999d1e375",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=ba3eb9958e8c0aa21536",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=845ba11d36e357420492",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=e40dcf843c95a51cd397",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=1d5319a48a28f62bb131",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=f320fe6298f15a06d573",
     "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js?id=91eea8e08d675f1a84d2",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=3b8d81b3f01fd4d10e0c",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=fb1f81d6571b2dd12e3c",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=605b221358837d98402f",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=4f51cba48ac89cf7bba2",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=4f6f1f8c89137d524d22",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=bdea74f5021aedc80a66",
     "/chunks/app-language~chunks/page-edit~chunks/pages~chunks/plan-create/fixed~chunks/plan-create/metere~daa2a968.js": "/chunks/app-language~chunks/page-edit~chunks/pages~chunks/plan-create/fixed~chunks/plan-create/metere~daa2a968.js?id=ef8cbb733f7e82636b51",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=e7d6335b8dad53b758b7",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=a12611142f24780ec2ac",
     "/chunks/app-others~chunks/payments/settings.js": "/chunks/app-others~chunks/payments/settings.js?id=a9748a3aa53098b75df6",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=62ce73b2d66590912cbc",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=eccbfcc8ca52a7739539",
-    "/chunks/billing.js": "/chunks/billing.js?id=9b7a2baac9a321749fd8",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=8d98791de2ec92174b6e",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c4092eb8dde1708f9adb",
+    "/chunks/billing.js": "/chunks/billing.js?id=7b1f4204ec58056828c2",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=8a6f15cace7263e2d5d1",
     "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/payments/settings~chunks/plan-su~cdf8788b.js": "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/payments/settings~chunks/plan-su~cdf8788b.js?id=4714188c1549bd8829ab",
-    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js?id=669bd6d15cfa4c6e75df",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js?id=a2d84cdce07ee462275a",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=8d151dcf54d769f95c78",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=65ee559ca803555be568",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=ff5ae86590a117661ac1",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=68bea69aaed67fa533bb",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=ffa760e709d0bf65f88a",
     "/chunks/dashboard~chunks/plan-subscribers~chunks/users.js": "/chunks/dashboard~chunks/plan-subscribers~chunks/users.js?id=42c543286b06a591f0b7",
-    "/chunks/database.js": "/chunks/database.js?id=38021b64e8ab2d213c19",
+    "/chunks/database.js": "/chunks/database.js?id=1dc5bbd9f2611c8fa8f8",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=fcba9acf60a855b730d5",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=cb6691f996a6ea765b4d",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=037716aec84bcf2dbd87",
     "/chunks/files.js": "/chunks/files.js?id=692eff6c814b00ac7d97",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=f41b30739fcbba3ae537",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=94ead73a2f7abcbc3214",
@@ -46,32 +46,32 @@
     "/chunks/files~chunks/platform~chunks/shared~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js?id=6e49d14fe5f9065503fb",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7fe909d93242299552ec",
     "/chunks/homepage.js": "/chunks/homepage.js?id=6a14173a7751010222ed",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=103caafd51390f5c7896",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a38af72f7ea45f34ffb9",
     "/chunks/invitation.js": "/chunks/invitation.js?id=ce0aa06dd9c62f505b9b",
     "/chunks/invoices.js": "/chunks/invoices.js?id=2a61a6196dc553fe193d",
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ef0a2dbe808eaee42c1f",
     "/chunks/not-found.js": "/chunks/not-found.js?id=bd6cc309172531900b13",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=1ce1c4f40fbb672c6c3e",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=5ff141bd6538ec84ecff",
     "/chunks/pages.js": "/chunks/pages.js?id=1ce97ecc061c94d203c3",
     "/chunks/payments.js": "/chunks/payments.js?id=56a633689fc98ab71b92",
-    "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=21c286ff2723603036ea",
-    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=2ae059b694da0f255e47",
+    "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=de07fd61143036495b08",
+    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=6412d419fe2b31b0540c",
     "/chunks/plan.js": "/chunks/plan.js?id=fc9e9e0b9bac63514475",
-    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=75b6e639a1fb66d34f10",
+    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=fcbc1489330dea0574f2",
     "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=22a5c4fb60a77b72cd4e",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=8289ae01c7e56404239b",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=7f623c8a4002f17eecef",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=1b3a7726ea964aba6449",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=2bad17d45da8aa6450c6",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=58d2f439052b4a01bb78",
     "/chunks/plans.js": "/chunks/plans.js?id=1ac621b39dd45f6d33de",
     "/chunks/platform.js": "/chunks/platform.js?id=c571ce8c6e3dcdc87c31",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=be5c13376dec07e289ff",
     "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=66e964be4ab127b1f723",
-    "/chunks/profile.js": "/chunks/profile.js?id=675055279ec50a36de80",
+    "/chunks/profile.js": "/chunks/profile.js?id=f86f4783c664ca19e6ed",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=d9af0efad2af2679954b",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8577d4c771602671b38a",
-    "/chunks/settings.js": "/chunks/settings.js?id=d0439508484fe741322e",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=1aeaaad4a4c6b719d31e",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=d1504f06d93b88572249",
+    "/chunks/settings.js": "/chunks/settings.js?id=59501723fd59f78212f2",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=bb40abb23017428fd887",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=03dc91e6eca3401c7264",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=aafc9cd6aa47b01bc25a",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
     "/chunks/shared.js": "/chunks/shared.js?id=a140c15b483547b020e9",
@@ -82,9 +82,9 @@
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=1abb5dd58d0ed626cd6e",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=e716349738364703249e",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=fedc03943b75d930b982",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=6e73b0735b7d7c45f712",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=a91cba41a099c8ecad24",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5238c711e2b9af197b22",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=614d9f87ae91fd824dd8",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=1d2cec8ea54b78a7e01e",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=15d40df6f0b187cf1129",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=3fffee3b8bab3e23ba18",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=d36f7ea9fc48b0226565",
     "/chunks/team-folders.js": "/chunks/team-folders.js?id=d0b1bb2f9e63fa36dd50",
@@ -92,11 +92,11 @@
     "/chunks/trash.js": "/chunks/trash.js?id=1f5f349fb9ec23ba2e93",
     "/chunks/user.js": "/chunks/user.js?id=d47acfdc8985d8823872",
     "/chunks/user-create.js": "/chunks/user-create.js?id=ec5e0749e0fc93be4664",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=d748d3ec3e036c247583",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=1639da11ff1a649d6dbf",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=979fd45e82e25a8445b4",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=e6ccfc8aa085e00af593",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=fc53187b5026f2a610dd",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=91cd831e23203fd3157c",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=6f4e3cc41a6803895594",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=c8869f60d85ee1e54db5",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=f3f616b4ea29972f1232",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0eec28eb9f9d3fdf1081",
     "/chunks/users.js": "/chunks/users.js?id=216e24e62ae9d5f79f2d",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~9be62a3c.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~9be62a3c.js?id=f6dd33e4294d33d5e335",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js?id=b40f5f673ec2ab7de20b",
@@ -377,5 +377,96 @@
     "/chunks/plan-subscribers.4614a1e1688c31c58f73.hot-update.js": "/chunks/plan-subscribers.4614a1e1688c31c58f73.hot-update.js",
     "/chunks/plan-subscribers.5fb18978de9b73629b06.hot-update.js": "/chunks/plan-subscribers.5fb18978de9b73629b06.hot-update.js",
     "/chunks/plan-subscribers.ccff2ffcc6d5dde6f5ca.hot-update.js": "/chunks/plan-subscribers.ccff2ffcc6d5dde6f5ca.hot-update.js",
-    "/chunks/plan-subscribers.b11c79b269e209b629ad.hot-update.js": "/chunks/plan-subscribers.b11c79b269e209b629ad.hot-update.js"
+    "/chunks/plan-subscribers.b11c79b269e209b629ad.hot-update.js": "/chunks/plan-subscribers.b11c79b269e209b629ad.hot-update.js",
+    "/chunks/settings-password.c96f88809d2296a2a2a0.hot-update.js": "/chunks/settings-password.c96f88809d2296a2a2a0.hot-update.js",
+    "/chunks/settings-password.9bd150ebec72a0590223.hot-update.js": "/chunks/settings-password.9bd150ebec72a0590223.hot-update.js",
+    "/chunks/billing.40345914a88799969fbf.hot-update.js": "/chunks/billing.40345914a88799969fbf.hot-update.js",
+    "/chunks/billing.da3f1a9b1dde33e41413.hot-update.js": "/chunks/billing.da3f1a9b1dde33e41413.hot-update.js",
+    "/js/main.486ff38ea87993b431ee.hot-update.js": "/js/main.486ff38ea87993b431ee.hot-update.js",
+    "/chunks/billing.486ff38ea87993b431ee.hot-update.js": "/chunks/billing.486ff38ea87993b431ee.hot-update.js",
+    "/chunks/app-others.01d28aca7734c4032c4d.hot-update.js": "/chunks/app-others.01d28aca7734c4032c4d.hot-update.js",
+    "/chunks/billing.01d28aca7734c4032c4d.hot-update.js": "/chunks/billing.01d28aca7734c4032c4d.hot-update.js",
+    "/chunks/payments/settings.01d28aca7734c4032c4d.hot-update.js": "/chunks/payments/settings.01d28aca7734c4032c4d.hot-update.js",
+    "/chunks/app-others.2b951828487e93cfe95c.hot-update.js": "/chunks/app-others.2b951828487e93cfe95c.hot-update.js",
+    "/chunks/billing.2b951828487e93cfe95c.hot-update.js": "/chunks/billing.2b951828487e93cfe95c.hot-update.js",
+    "/chunks/payments/settings.2b951828487e93cfe95c.hot-update.js": "/chunks/payments/settings.2b951828487e93cfe95c.hot-update.js",
+    "/chunks/app-others.4ece3781c948c3ec725b.hot-update.js": "/chunks/app-others.4ece3781c948c3ec725b.hot-update.js",
+    "/chunks/billing.4ece3781c948c3ec725b.hot-update.js": "/chunks/billing.4ece3781c948c3ec725b.hot-update.js",
+    "/chunks/payments/settings.4ece3781c948c3ec725b.hot-update.js": "/chunks/payments/settings.4ece3781c948c3ec725b.hot-update.js",
+    "/chunks/billing.0264d24a3eb6beb62b40.hot-update.js": "/chunks/billing.0264d24a3eb6beb62b40.hot-update.js",
+    "/chunks/billing.09dbf86eedb65b93c575.hot-update.js": "/chunks/billing.09dbf86eedb65b93c575.hot-update.js",
+    "/chunks/settings-password.c679fca1bd751bd4151d.hot-update.js": "/chunks/settings-password.c679fca1bd751bd4151d.hot-update.js",
+    "/chunks/user-detail.d38c287cbfd52661bb5d.hot-update.js": "/chunks/user-detail.d38c287cbfd52661bb5d.hot-update.js",
+    "/chunks/user-detail.c869c0412c49fe7a1a3b.hot-update.js": "/chunks/user-detail.c869c0412c49fe7a1a3b.hot-update.js",
+    "/chunks/user-detail.68b130f573995cec33d0.hot-update.js": "/chunks/user-detail.68b130f573995cec33d0.hot-update.js",
+    "/chunks/user-detail.021bbec787564de32556.hot-update.js": "/chunks/user-detail.021bbec787564de32556.hot-update.js",
+    "/chunks/user-detail.0aa205b343e0bcc0a50d.hot-update.js": "/chunks/user-detail.0aa205b343e0bcc0a50d.hot-update.js",
+    "/chunks/user-storage.9c2accd1e7a3f9956a7e.hot-update.js": "/chunks/user-storage.9c2accd1e7a3f9956a7e.hot-update.js",
+    "/js/main.fe6e06bbdc6d65560905.hot-update.js": "/js/main.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/app-appearance.fe6e06bbdc6d65560905.hot-update.js": "/chunks/app-appearance.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~fdb7bddc.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~fdb7bddc.js?id=9d0822140fbccb3d3cf6",
+    "/chunks/app-email.fe6e06bbdc6d65560905.hot-update.js": "/chunks/app-email.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/app-index.fe6e06bbdc6d65560905.hot-update.js": "/chunks/app-index.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/app-others.fe6e06bbdc6d65560905.hot-update.js": "/chunks/app-others.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/payments/billings.fe6e06bbdc6d65560905.hot-update.js": "/chunks/payments/billings.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/payments/settings.fe6e06bbdc6d65560905.hot-update.js": "/chunks/payments/settings.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/user-delete.fe6e06bbdc6d65560905.hot-update.js": "/chunks/user-delete.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/user-detail.fe6e06bbdc6d65560905.hot-update.js": "/chunks/user-detail.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/user-password.fe6e06bbdc6d65560905.hot-update.js": "/chunks/user-password.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/user-storage.fe6e06bbdc6d65560905.hot-update.js": "/chunks/user-storage.fe6e06bbdc6d65560905.hot-update.js",
+    "/chunks/plan-create/fixed.09da0457eb3f331f733c.hot-update.js": "/chunks/plan-create/fixed.09da0457eb3f331f733c.hot-update.js",
+    "/chunks/platform~chunks/shared.7f8ef06621a18f092172.hot-update.js": "/chunks/platform~chunks/shared.7f8ef06621a18f092172.hot-update.js",
+    "/chunks/platform~chunks/shared.b74a46ca552c01b89a08.hot-update.js": "/chunks/platform~chunks/shared.b74a46ca552c01b89a08.hot-update.js",
+    "/chunks/platform~chunks/shared.943186dd0b23a309dd28.hot-update.js": "/chunks/platform~chunks/shared.943186dd0b23a309dd28.hot-update.js",
+    "/chunks/admin.3cce51b3dec08ee773e3.hot-update.js": "/chunks/admin.3cce51b3dec08ee773e3.hot-update.js",
+    "/chunks/settings.3cce51b3dec08ee773e3.hot-update.js": "/chunks/settings.3cce51b3dec08ee773e3.hot-update.js",
+    "/chunks/admin.cdc5416ae0d56946e877.hot-update.js": "/chunks/admin.cdc5416ae0d56946e877.hot-update.js",
+    "/chunks/settings.cdc5416ae0d56946e877.hot-update.js": "/chunks/settings.cdc5416ae0d56946e877.hot-update.js",
+    "/chunks/admin.387c25c05da8ad3b149d.hot-update.js": "/chunks/admin.387c25c05da8ad3b149d.hot-update.js",
+    "/chunks/settings.387c25c05da8ad3b149d.hot-update.js": "/chunks/settings.387c25c05da8ad3b149d.hot-update.js",
+    "/chunks/admin.2029254096fc482af493.hot-update.js": "/chunks/admin.2029254096fc482af493.hot-update.js",
+    "/chunks/settings.2029254096fc482af493.hot-update.js": "/chunks/settings.2029254096fc482af493.hot-update.js",
+    "/chunks/admin.96f8e96930f4ff47ae35.hot-update.js": "/chunks/admin.96f8e96930f4ff47ae35.hot-update.js",
+    "/chunks/settings.96f8e96930f4ff47ae35.hot-update.js": "/chunks/settings.96f8e96930f4ff47ae35.hot-update.js",
+    "/chunks/settings.717e0e9e4a71d77aff84.hot-update.js": "/chunks/settings.717e0e9e4a71d77aff84.hot-update.js",
+    "/chunks/settings.79606a998b6ffc282625.hot-update.js": "/chunks/settings.79606a998b6ffc282625.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.846c40e57a8afb8da4d7.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.846c40e57a8afb8da4d7.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.64969222fa2a5a75bec4.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.64969222fa2a5a75bec4.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2ec16ba8b9d289710698.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2ec16ba8b9d289710698.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8205e054de4e9574e3f5.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8205e054de4e9574e3f5.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.3fc2fa74251ec403d88a.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.3fc2fa74251ec403d88a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1b2f8f7b004df3296297.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1b2f8f7b004df3296297.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/app-language.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/app-language.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/billings-detail.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/billings-detail.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/dashboard.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/dashboard.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/database.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/database.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/environment-setup.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/environment-setup.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/installation-disclaimer.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/installation-disclaimer.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/page-edit.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/page-edit.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/plan-delete.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/plan-delete.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/plan-settings.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/plan-settings.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/profile.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/profile.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/settings-password.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/settings-password.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/status-check.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/status-check.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/stripe-credentials.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/stripe-credentials.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/subscription-plans.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/subscription-plans.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/user-delete.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/user-delete.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/user-detail.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/user-detail.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/user-password.04d4ef41a9ce63a2b839.hot-update.js": "/chunks/user-password.04d4ef41a9ce63a2b839.hot-update.js",
+    "/chunks/dashboard.3ef7837a13a9e0e9c440.hot-update.js": "/chunks/dashboard.3ef7837a13a9e0e9c440.hot-update.js",
+    "/chunks/dashboard.16e3f0d5f484769b9c3b.hot-update.js": "/chunks/dashboard.16e3f0d5f484769b9c3b.hot-update.js",
+    "/chunks/billing.4fb9d19a86f214c69a83.hot-update.js": "/chunks/billing.4fb9d19a86f214c69a83.hot-update.js",
+    "/chunks/dashboard.4fb9d19a86f214c69a83.hot-update.js": "/chunks/dashboard.4fb9d19a86f214c69a83.hot-update.js",
+    "/chunks/settings-storage.4fb9d19a86f214c69a83.hot-update.js": "/chunks/settings-storage.4fb9d19a86f214c69a83.hot-update.js",
+    "/chunks/user-storage.4fb9d19a86f214c69a83.hot-update.js": "/chunks/user-storage.4fb9d19a86f214c69a83.hot-update.js",
+    "/chunks/user-subscription.4fb9d19a86f214c69a83.hot-update.js": "/chunks/user-subscription.4fb9d19a86f214c69a83.hot-update.js",
+    "/js/main.59b67aac3f6fa533bc07.hot-update.js": "/js/main.59b67aac3f6fa533bc07.hot-update.js",
+    "/chunks/settings-storage.92baff6c09969255fe32.hot-update.js": "/chunks/settings-storage.92baff6c09969255fe32.hot-update.js",
+    "/chunks/billing.abb02b6277859f58d474.hot-update.js": "/chunks/billing.abb02b6277859f58d474.hot-update.js",
+    "/chunks/user-subscription.c50c214abf0018d85ae6.hot-update.js": "/chunks/user-subscription.c50c214abf0018d85ae6.hot-update.js",
+    "/chunks/app-setup.8d730de7eff1938253a3.hot-update.js": "/chunks/app-setup.8d730de7eff1938253a3.hot-update.js",
+    "/chunks/user-subscription.bc00d83e6108d3670663.hot-update.js": "/chunks/user-subscription.bc00d83e6108d3670663.hot-update.js",
+    "/chunks/user-subscription.fbc90c133a8b0a24b861.hot-update.js": "/chunks/user-subscription.fbc90c133a8b0a24b861.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 7436cdc7..5d99652d 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -146,7 +146,7 @@ export default {
 @import '/resources/sass/vuefilemanager/_mixins';
 
 .card {
-	@apply dark:bg-dark-foreground bg-white p-6 rounded-xl lg:mb-6 mb-5
+	@apply dark:bg-dark-foreground bg-white sm:p-6 p-4 rounded-xl lg:mb-6 mb-5
 }
 
 .widget-card {
diff --git a/resources/js/components/Admin/AppInputButton.vue b/resources/js/components/Admin/AppInputButton.vue
index b746fa10..141add9e 100644
--- a/resources/js/components/Admin/AppInputButton.vue
+++ b/resources/js/components/Admin/AppInputButton.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="{'mb-7': !isLast}" class="sm:flex justify-between sm:space-x-8 space-x-2 sm:space-y-0 space-y-4 w-full">
+	<div :class="{'mb-7': !isLast}" class="sm:flex justify-between sm:space-x-8 sm:space-x-2 sm:space-y-0 space-y-4 w-full">
 
 		<!--Label for input-->
 		<div class="leading-5">
diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue
index 2623effe..6739c7a0 100644
--- a/resources/js/components/FilesView/Option.vue
+++ b/resources/js/components/FilesView/Option.vue
@@ -1,49 +1,51 @@
 <template>
-    <li class="2xl:py-4 xl:py-3 lg:py-2.5 py-4 px-5 flex items-center" :class="{'dark:hover:bg-4x-dark-foreground hover:bg-light-background cursor-pointer group': ! isHoverDisabled}">
-        <div class="mr-4">
-            <calendar-icon v-if="icon === 'calendar'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <grid-icon v-if="icon === 'grid'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <list-icon v-if="icon === 'list'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <trash-2-icon v-if="icon === 'trash'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <life-buoy-icon v-if="icon === 'restore'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <trash-icon v-if="icon === 'empty-trash'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <eye-icon v-if="icon ==='detail'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <download-cloud-icon v-if="icon === 'download'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <edit2-icon v-if="icon === 'rename'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <corner-down-right-icon v-if="icon === 'move-item'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <link-icon v-if="icon === 'share'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <star-icon v-if="icon === 'favourites'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <folder-plus-icon v-if="icon === 'create-folder'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <smile-icon v-if="icon === 'no-options'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <paperclip-icon v-if="icon === 'zip-folder'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <alphabet-icon v-if="icon === 'alphabet'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <star-icon v-if="icon === 'star'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <hard-drive-icon v-if="icon === 'hard-drive'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <upload-cloud-icon v-if="icon === 'upload-cloud'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <users-icon v-if="icon === 'users'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <user-icon v-if="icon === 'user'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <user-plus-icon v-if="icon === 'user-plus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <user-minus-icon v-if="icon === 'user-minus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <user-check-icon v-if="icon === 'user-check'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <settings-icon v-if="icon === 'settings'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <power-icon v-if="icon === 'power'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <lock-icon v-if="icon === 'lock'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <cloud-icon v-if="icon === 'cloud'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <credit-card-icon v-if="icon === 'credit-card'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <file-text-icon v-if="icon === 'file-text'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <database-icon v-if="icon === 'database'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <globe-icon v-if="icon === 'globe'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <monitor-icon v-if="icon === 'monitor'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <box-icon v-if="icon === 'box'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <folder-plus-icon v-if="icon === 'folder-plus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-        </div>
-        <b class="font-bold text-sm group-hover-text-theme" :class="{'text-theme': isActive}">
-            {{ title }}
-        </b>
+    <li class="2xl:py-4 xl:py-3 lg:py-2.5 py-4 px-5 flex items-center justify-between" :class="{'dark:hover:bg-4x-dark-foreground hover:bg-light-background cursor-pointer group': ! isHoverDisabled}">
+        <div class="flex items-center">
+			<div class="mr-4">
+				<calendar-icon v-if="icon === 'calendar'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<grid-icon v-if="icon === 'grid'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<list-icon v-if="icon === 'list'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<trash-2-icon v-if="icon === 'trash'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<life-buoy-icon v-if="icon === 'restore'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<trash-icon v-if="icon === 'empty-trash'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<eye-icon v-if="icon ==='detail'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<download-cloud-icon v-if="icon === 'download'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<edit2-icon v-if="icon === 'rename'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<corner-down-right-icon v-if="icon === 'move-item'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<link-icon v-if="icon === 'share'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<star-icon v-if="icon === 'favourites'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<folder-plus-icon v-if="icon === 'create-folder'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<smile-icon v-if="icon === 'no-options'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<paperclip-icon v-if="icon === 'zip-folder'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<alphabet-icon v-if="icon === 'alphabet'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<star-icon v-if="icon === 'star'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<hard-drive-icon v-if="icon === 'hard-drive'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<upload-cloud-icon v-if="icon === 'upload-cloud'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<users-icon v-if="icon === 'users'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<user-icon v-if="icon === 'user'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<user-plus-icon v-if="icon === 'user-plus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<user-minus-icon v-if="icon === 'user-minus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<user-check-icon v-if="icon === 'user-check'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<settings-icon v-if="icon === 'settings'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<power-icon v-if="icon === 'power'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<lock-icon v-if="icon === 'lock'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<cloud-icon v-if="icon === 'cloud'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<credit-card-icon v-if="icon === 'credit-card'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<file-text-icon v-if="icon === 'file-text'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<database-icon v-if="icon === 'database'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<globe-icon v-if="icon === 'globe'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<monitor-icon v-if="icon === 'monitor'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<box-icon v-if="icon === 'box'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+				<folder-plus-icon v-if="icon === 'folder-plus'" size="17" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+			</div>
+			<b class="font-bold text-sm group-hover-text-theme" :class="{'text-theme': isActive}">
+				{{ title }}
+			</b>
+		</div>
         <div v-if="arrow" class="ml-2">
-            <chevron-right-icon v-if="arrow === 'right'" size="14" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <arrow-up-icon v-if="arrow === 'up'" size="14" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
-            <arrow-down-icon v-if="arrow === 'down'" size="14" class="vue-feather group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <chevron-right-icon v-if="arrow === 'right'" size="14" class="vue-feather group-hover-text-theme opacity-50" :class="{'text-theme': isActive}"/>
+            <arrow-up-icon v-if="arrow === 'up'" size="14" class="vue-feather group-hover-text-theme opacity-50" :class="{'text-theme': isActive}"/>
+            <arrow-down-icon v-if="arrow === 'down'" size="14" class="vue-feather group-hover-text-theme opacity-50" :class="{'text-theme': isActive}"/>
         </div>
     </li>
 </template>
diff --git a/resources/js/components/Others/Forms/FormLabel.vue b/resources/js/components/Others/Forms/FormLabel.vue
index 8fb603ec..6347e7d2 100644
--- a/resources/js/components/Others/Forms/FormLabel.vue
+++ b/resources/js/components/Others/Forms/FormLabel.vue
@@ -13,7 +13,7 @@
         <bell-icon v-if="icon === 'bell'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <key-icon v-if="icon === 'key'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <users-icon v-if="icon === 'users'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
-        <b class="font-bold dark:text-gray-200 text-lg">
+        <b class="font-bold dark:text-gray-200 sm:text-lg text-md">
             <slot></slot>
         </b>
     </div>
diff --git a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
index b01d4c5f..fcc2bbcf 100644
--- a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
+++ b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
@@ -5,7 +5,7 @@
 
 		<!--Payment Options-->
 		<div v-if="isPaymentOptionPage">
-			<PopupContent class="px-4">
+			<PopupContent>
 
 				<!--Stripe implementation-->
 				<PaymentMethod
@@ -95,7 +95,7 @@
 				</div>
 
 				<!--List available plans-->
-				<div class="px-4">
+				<div>
 					<PlanDetail
 						v-for="(plan, i) in plans.data"
 						:plan="plan"
diff --git a/resources/js/components/Subscription/UserBalance.vue b/resources/js/components/Subscription/UserBalance.vue
index caff6aa4..ddd0db1b 100644
--- a/resources/js/components/Subscription/UserBalance.vue
+++ b/resources/js/components/Subscription/UserBalance.vue
@@ -4,7 +4,7 @@
 			{{ $t('Balance') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 			{{ user.data.relationships.balance.data.attributes.formatted }}
 		</b>
 
diff --git a/resources/js/components/Subscription/UserEditSubscription.vue b/resources/js/components/Subscription/UserEditSubscription.vue
index 0b4ba8cf..0bed6f99 100644
--- a/resources/js/components/Subscription/UserEditSubscription.vue
+++ b/resources/js/components/Subscription/UserEditSubscription.vue
@@ -4,21 +4,23 @@
 			{{ $t('Edit your Subscription') }}
 		</FormLabel>
 
-		<AppInputSwitch v-if="subscription.attributes.status !== 'cancelled'" :title="$t('Cancel Subscription')" :description="$t('You can cancel your subscription now. You\'ll continue to have access to the features you\'ve paid for until the end of your billing cycle.')">
+		<AppInputButton v-if="subscription.attributes.status !== 'cancelled'" :title="$t('Cancel Subscription')" :description="$t('You can cancel your subscription now. You\'ll continue to have access to the features you\'ve paid for until the end of your billing cycle.')">
 			<ButtonBase @click.native="cancelSubscriptionConfirmation" :loading="isCancelling" class="sm:w-auto w-full" button-style="secondary">
 				{{ $t('Cancel Now') }}
 			</ButtonBase>
-		</AppInputSwitch>
+		</AppInputButton>
 
-		<AppInputSwitch :title="$t('Upgrade or Downgrade Plan')" :description="$t('You can upgrade your plan at any time you want.')" :is-last="true">
+		<AppInputButton :title="$t('Upgrade or Downgrade Plan')" :description="$t('You can upgrade your plan at any time you want.')" :is-last="true">
 			<ButtonBase @click.native="$openUpgradeOptions" class="sm:w-auto w-full" button-style="secondary">
 				{{ $t('Change Plan') }}
 			</ButtonBase>
-		</AppInputSwitch>
+		</AppInputButton>
 	</div>
 </template>
 
 <script>
+	import AppInputButton from "../Admin/AppInputButton";
+	import AppInputText from "../Admin/AppInputText";
 	import AppInputSwitch from "../Admin/AppInputSwitch"
 	import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
 	import FormLabel from "../Others/Forms/FormLabel"
@@ -28,7 +30,9 @@
 	export default {
 		name: 'UserEditSubscription',
 		components: {
+			AppInputButton,
 			AppInputSwitch,
+			AppInputText,
 			ButtonBase,
 			FormLabel
 		},
diff --git a/resources/js/components/Subscription/UserEmptySubscription.vue b/resources/js/components/Subscription/UserEmptySubscription.vue
index e41e7817..63f3c525 100644
--- a/resources/js/components/Subscription/UserEmptySubscription.vue
+++ b/resources/js/components/Subscription/UserEmptySubscription.vue
@@ -4,7 +4,7 @@
 			{{ $t('Subscription') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 			{{ $t('Free Plan') }}
 		</b>
 
diff --git a/resources/js/components/Subscription/UserFailedPayments.vue b/resources/js/components/Subscription/UserFailedPayments.vue
index f492fcf2..564c1a00 100644
--- a/resources/js/components/Subscription/UserFailedPayments.vue
+++ b/resources/js/components/Subscription/UserFailedPayments.vue
@@ -4,7 +4,7 @@
 			{{ $t('Failed Payments') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 			-{{ user.data.meta.totalDebt.formatted }}
 		</b>
 
diff --git a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
index 1f439ec8..cb041049 100644
--- a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
+++ b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
@@ -4,7 +4,7 @@
 			{{ $t('Subscription') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-xl font-extrabold -mt-3 block mb-0.5">
 			{{ status }}
 		</b>
 
diff --git a/resources/js/components/Subscription/UserUpdatePaymentMethodsExternally.vue b/resources/js/components/Subscription/UserUpdatePaymentMethodsExternally.vue
index d583dfd6..24995d27 100644
--- a/resources/js/components/Subscription/UserUpdatePaymentMethodsExternally.vue
+++ b/resources/js/components/Subscription/UserUpdatePaymentMethodsExternally.vue
@@ -4,11 +4,11 @@
 			{{ $t('Update Payments') }}
 		</FormLabel>
 
-		<AppInputSwitch :title="$t('Update your Payment Method')" :description="$t('You will be redirected to your payment provider to edit your payment method.')" :is-last="true">
+		<AppInputButton :title="$t('Update your Payment Method')" :description="$t('You will be redirected to your payment provider to edit your payment method.')" :is-last="true">
 			<ButtonBase @click.native="updatePaymentMethod" :loading="isGeneratedUpdateLink" class="sm:w-auto w-full" button-style="theme">
 				{{ $t('Update Payments') }}
 			</ButtonBase>
-		</AppInputSwitch>
+		</AppInputButton>
 	</div>
 </template>
 
@@ -18,10 +18,12 @@
 	import FormLabel from "../Others/Forms/FormLabel"
 	import axios from "axios";
 	import {events} from "../../bus";
+	import AppInputButton from "../Admin/AppInputButton";
 
 	export default {
 		name: 'UserUpdatePaymentMethodsExternally',
 		components: {
+			AppInputButton,
 			AppInputSwitch,
 			ButtonBase,
 			FormLabel
diff --git a/resources/js/components/Subscription/UserUsageEstimates.vue b/resources/js/components/Subscription/UserUsageEstimates.vue
index 6bb4aeb3..24341536 100644
--- a/resources/js/components/Subscription/UserUsageEstimates.vue
+++ b/resources/js/components/Subscription/UserUsageEstimates.vue
@@ -4,7 +4,7 @@
 			{{ $t('Usage Estimates') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 			{{ user.data.meta.usages.costEstimate }}
 		</b>
 
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index 59f3a4e3..7fb79711 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -44,7 +44,7 @@
 						{{ $t('Total Users') }}
 					</FormLabel>
 
-					<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+					<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 						{{ data.users.total }}
 					</b>
 
@@ -60,7 +60,7 @@
 						{{ $t('Total Storage') }}
 					</FormLabel>
 
-					<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+					<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 						{{ data.disk.used }}
 					</b>
 
@@ -76,7 +76,7 @@
 						{{ $t('Earnings') }}
 					</FormLabel>
 
-					<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+					<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 						{{ data.app.earnings }}
 					</b>
 
@@ -95,7 +95,7 @@
 					{{ $t('Upload') }}
 				</FormLabel>
 
-				<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+				<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 					{{ data.disk.upload.total }}
 				</b>
 
@@ -112,7 +112,7 @@
 					{{ $t('Download') }}
 				</FormLabel>
 
-				<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+				<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 					{{ data.disk.download.total }}
 				</b>
 
diff --git a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
index 59f2734a..bf181888 100644
--- a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
@@ -26,7 +26,7 @@
 				{{ $t('Pricing') }}
 			</FormLabel>
 
-			<div class="flex space-x-4">
+			<div class="md:flex justify-items md:space-x-4">
 				<!--Price-->
 				<ValidationProvider tag="div" mode="passive" name="Price" rules="required" v-slot="{ errors }" class="w-full">
 					<AppInputText :title="$t('admin_page_plans.form.price')" class="w-full">
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
index c7162caf..44104628 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
@@ -8,9 +8,9 @@
             <ValidationObserver ref="changeRole" @submit.prevent="changeRole" v-slot="{ invalid }" tag="form">
                 <ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="Role" rules="required">
 					<AppInputText :title="$t('admin_page_user.select_role')" :description="$t('user_box_role.description')" :error="errors[0]" :is-last="true">
-						<div class="flex space-x-4">
+						<div class="sm:flex sm:space-x-4 sm:space-y-0 space-y-4">
 							<SelectInput v-model="userRole" :options="$translateSelectOptions(roles)" :placeholder="$t('admin_page_user.select_role')" :isError="errors[0]" />
-							<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="theme" class="submit-button">
+							<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="theme" class="sm:w-auto w-full">
 								{{ $t('admin_page_user.save_role') }}
 							</ButtonBase>
 						</div>
@@ -19,17 +19,32 @@
             </ValidationObserver>
         </div>
         <div class="card shadow-card">
-            <FormLabel>{{ $t('admin_page_user.label_person_info') }}</FormLabel>
-			<!--Email-->
-            <AppInputText :title="$t('page_registration.label_email')">
-                <input :value="user.data.attributes.email"
-					   :placeholder="$t('page_registration.placeholder_email')"
-					   type="email"
-					   class="focus-border-theme input-dark"
-					   disabled
-				/>
-            </AppInputText>
+            <FormLabel>
+				{{ $t('admin_page_user.label_person_info') }}
+			</FormLabel>
+
 			<!--Name-->
+			<div class="md:flex justify-items md:space-x-4">
+				<AppInputText :title="$t('First Name')" class="w-full">
+					<input
+						disabled
+						:value="user.data.relationships.settings.data.attributes.first_name"
+						:placeholder="$t('page_registration.placeholder_name')"
+						type="text"
+						class="focus-border-theme input-dark"
+					/>
+				</AppInputText>
+				<AppInputText :title="$t('Last Name')" class="w-full">
+					<input
+						disabled
+						:value="user.data.relationships.settings.data.attributes.last_name"
+						:placeholder="$t('page_registration.placeholder_name')"
+						type="text"
+						class="focus-border-theme input-dark"
+					/>
+				</AppInputText>
+			</div>
+
             <AppInputText :title="$t('page_registration.label_name')" :is-last="true">
                 <input :value="user.data.relationships.settings.data.attributes.name"
 					   :placeholder="$t('page_registration.placeholder_name')"
diff --git a/resources/js/views/Admin/Users/UserTabs/UserFixedSubscription.vue b/resources/js/views/Admin/Users/UserTabs/UserFixedSubscription.vue
index 31bae077..90d8019b 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserFixedSubscription.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserFixedSubscription.vue
@@ -4,7 +4,7 @@
 			{{ $t('Subscription') }}
 		</FormLabel>
 
-		<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+		<b class="sm:text-3xl text-xl font-extrabold -mt-3 block mb-0.5">
 			{{ status }}
 		</b>
 
diff --git a/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue b/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
index ecb2a617..d32b7a50 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
@@ -6,14 +6,14 @@
 				{{ $t('Balance') }}
 			</FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ user.data.relationships.balance.data.attributes.formatted }}
 			</b>
 
 			<ValidationObserver ref="creditUserBalance" @submit.prevent="increaseBalance" v-slot="{ invalid }" tag="form" class="mt-6">
 				<ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="Balance Amount" rules="required">
 					<AppInputText :description="$t('User balance will be increased for the amount above.')" :error="errors[0]" :is-last="true">
-						<div class="flex space-x-4">
+						<div class="sm:flex sm:space-x-4 sm:space-y-0 space-y-4">
 							<input v-model="balanceAmount"
 								   :placeholder="$t('Increase user balance for...')"
 								   type="number"
@@ -22,7 +22,7 @@
 								   class="focus-border-theme input-dark"
 								   :class="{'border-red': errors[0]}"
 							/>
-							<ButtonBase type="submit" button-style="theme" class="submit-button"
+							<ButtonBase type="submit" button-style="theme" class="sm:w-auto w-full"
 								:loading="isUpdatingBalanceAmount"
 								:disabled="isUpdatingBalanceAmount"
 							>
@@ -40,7 +40,7 @@
 				{{ $t('Usage Estimates') }}
 			</FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ user.data.meta.usages.costEstimate }}
 			</b>
 
diff --git a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
index 5c6e62f7..5d614536 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
@@ -5,11 +5,11 @@
                 {{ $t('user_box_password.title') }}
             </FormLabel>
 
-			<AppInputSwitch :title="$t('Reset User Password')" :description="$t('user_box_password.description')" :is-last="true">
+			<AppInputText :title="$t('Reset User Password')" :description="$t('user_box_password.description')" :is-last="true">
 				<ButtonBase @click.native="requestPasswordResetEmail" :loading="isSendingRequest" :disabled="isSendingRequest" class="sm:w-auto w-full" button-style="theme">
 					{{ $t('admin_page_user.send_password_link') }}
 				</ButtonBase>
-			</AppInputSwitch>
+			</AppInputText>
 		</div>
     </PageTab>
 </template>
@@ -26,10 +26,12 @@
     import {required} from 'vee-validate/dist/rules'
     import {events} from '/resources/js/bus'
     import axios from 'axios'
+	import AppInputText from "../../../../components/Admin/AppInputText";
 
     export default {
         name: 'UserPassword',
         components: {
+			AppInputText,
             ValidationProvider,
             ValidationObserver,
 			AppInputSwitch,
diff --git a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
index a7884efb..1c2d82aa 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
@@ -7,7 +7,7 @@
                 {{ $t('Storage Usage') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ storage.data.attributes.used }}
 			</b>
 
@@ -24,7 +24,7 @@
                 {{ $t('Upload') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ storage.data.meta.traffic.upload }}
 			</b>
 
@@ -41,7 +41,7 @@
                 {{ $t('Download') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ storage.data.meta.traffic.download }}
 			</b>
 
@@ -60,7 +60,7 @@
             <ValidationObserver ref="changeStorageCapacity" @submit.prevent="changeStorageCapacity" v-slot="{ invalid }" tag="form">
                 <ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="Capacity" rules="required">
 					<AppInputText :title="$t('admin_page_user.label_change_capacity')" :description="$t('user_box_storage.description')" :error="errors[0]" :is-last="true">
-						<div class="flex space-x-4">
+						<div class="sm:flex sm:space-x-4 sm:space-y-0 space-y-4">
 							<input v-model="capacity"
 								   :placeholder="$t('admin_page_user.label_change_capacity')"
 								   type="number"
@@ -69,7 +69,7 @@
 								   class="focus-border-theme input-dark"
 								   :class="{'border-red': errors[0]}"
 							/>
-							<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="theme" class="submit-button">
+							<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="theme" class="sm:w-auto w-full">
 								{{ $t('admin_page_user.change_capacity') }}
 							</ButtonBase>
 						</div>
diff --git a/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue b/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue
index dafae252..00c7abed 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserSubscription.vue
@@ -19,7 +19,7 @@
 				{{ $t('Subscription') }}
 			</FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ $t('Free Plan') }}
 			</b>
 
diff --git a/resources/js/views/MobileNavigationToolbar.vue b/resources/js/views/MobileNavigationToolbar.vue
index b9096089..1f20426d 100644
--- a/resources/js/views/MobileNavigationToolbar.vue
+++ b/resources/js/views/MobileNavigationToolbar.vue
@@ -2,17 +2,17 @@
 	<div class="flex text-center py-5 px-4 w-full justify-between items-center z-20 lg:hidden block">
 
 		<!-- Go back-->
-		<div @click="$router.back()" class="go-back-button flex text-left items-center">
+		<div @click="$router.back()" class="go-back-button flex text-left items-center cursor-pointer">
 			<chevron-left-icon size="17" class="transform align-middle mr-2 -ml-1" />
 
 			<!--Folder Title-->
 			<div class="text-sm align-middle font-bold overflow-hidden overflow-ellipsis inline-block whitespace-nowrap transition-all duration-200" style="max-width: 200px;">
-				{{ $t('Profile') }}
+				{{ locationName }}
 			</div>
 		</div>
 
 		<!--More Actions-->
-		<div @click="$showMobileMenu('user-navigation')" class="pr-2">
+		<div @click="$showMobileMenu('user-navigation')" class="pr-2 cursor-pointer">
 			<menu-icon size="17" />
 		</div>
 	</div>
@@ -25,6 +25,11 @@
 		components: {
 			ChevronLeftIcon,
 			MenuIcon,
+		},
+		computed: {
+			locationName() {
+				return this.$t(this.$route.meta.title)
+			}
 		}
 	}
 </script>
diff --git a/resources/js/views/SetupWizard/AppSetup.vue b/resources/js/views/SetupWizard/AppSetup.vue
index 879522ba..acce86f1 100644
--- a/resources/js/views/SetupWizard/AppSetup.vue
+++ b/resources/js/views/SetupWizard/AppSetup.vue
@@ -94,7 +94,7 @@
                         <div class="inline-wrapper">
                             <div class="switch-label">
                                 <label class="input-label">Storage Limitation:</label>
-                                <small class="input-help">If this value is off, all users will have infinity storage capacity and you won't be <br/>able to charge your users for storage plan.</small>
+                                <small class="input-help">If this value is off, all users will have infinity storage capacity and you won't be able to charge your users for storage plan.</small>
                             </div>
                             <SwitchInput v-model="app.storageLimitation" class="switch" :state="app.storageLimitation"/>
                         </div>
@@ -120,7 +120,7 @@
                         <div class="inline-wrapper">
                             <div class="switch-label">
                                 <label class="input-label">Allow User Registration:</label>
-                                <small class="input-help">You can disable public registration for new users. You will still able to <br/>create new users in administration panel.</small>
+                                <small class="input-help">You can disable public registration for new users. You will still able to create new users in administration panel.</small>
                             </div>
                             <SwitchInput v-model="app.userRegistration" class="switch" :state="app.userRegistration"/>
                         </div>
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index 4bd28c01..744a34b8 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -9,11 +9,11 @@
             <AppInputSwitch :title="$t('popup_2fa.switch_title')" :description="$t('popup_2fa.switch_info')" :is-last="! user.data.attributes.two_factor_authentication">
                 <SwitchInput v-model="user.data.attributes.two_factor_authentication" class="switch" :state="user.data.attributes.two_factor_authentication" />
             </AppInputSwitch>
-            <AppInputSwitch v-if="user && user.data.attributes.two_factor_authentication" :title="$t('popup_2fa.codes_title')" :description="$t('popup_2fa.codes_info')" :is-last="true">
+            <AppInputButton v-if="user && user.data.attributes.two_factor_authentication" :title="$t('popup_2fa.codes_title')" :description="$t('popup_2fa.codes_info')" :is-last="true">
                 <ButtonBase class="w-full" button-style="secondary" @click.native="showRecoveryCodes">
                     {{ $t('popup_2fa.codes_button') }}
                 </ButtonBase>
-            </AppInputSwitch>
+            </AppInputButton>
         </div>
 
 		<!--Get personal api keys-->
@@ -37,7 +37,7 @@
                     </li>
                 </ul>
             </InfoBox>
-            <ButtonBase @click.native="openCreateTokenPopup" type="submit" button-style="theme" class="confirm-form">
+            <ButtonBase @click.native="openCreateTokenPopup" type="submit" button-style="theme" class="sm:w-auto w-full">
                 {{ $t('personal_token.create_token') }}
             </ButtonBase>
         </div>
@@ -66,7 +66,7 @@
 				</AppInputText>
 			</ValidationProvider>
 
-			<ButtonBase type="submit" button-style="theme" class="confirm-form">
+			<ButtonBase type="submit" button-style="theme" class="sm:w-auto w-full">
 				{{ $t('profile.store_pass') }}
 			</ButtonBase>
 		</ValidationObserver>
@@ -89,10 +89,12 @@
 	import {events} from '/resources/js/bus'
 	import {mapGetters} from 'vuex'
 	import axios from 'axios'
+	import AppInputButton from "../../components/Admin/AppInputButton";
 
 	export default {
 		name: 'Password',
 		components: {
+			AppInputButton,
 			ValidationProvider,
 			ValidationObserver,
 			UserImageInput,
diff --git a/resources/js/views/User/Storage.vue b/resources/js/views/User/Storage.vue
index 6443268d..df425c2d 100644
--- a/resources/js/views/User/Storage.vue
+++ b/resources/js/views/User/Storage.vue
@@ -5,7 +5,7 @@
                 {{ $t('Storage Usage') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block">
 				{{ storage.data.attributes.used }}
 			</b>
 
@@ -20,7 +20,7 @@
                 {{ $t('Upload') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ storage.data.meta.traffic.upload }}
 			</b>
 
@@ -35,7 +35,7 @@
                 {{ $t('Download') }}
             </FormLabel>
 
-			<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
+			<b class="sm:text-3xl text-2xl font-extrabold -mt-3 block mb-0.5">
 				{{ storage.data.meta.traffic.download }}
 			</b>