diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index da7dbcbe..fd3828fc 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,75 +2,75 @@
     "/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=10aa252dd2e9325eedf8",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=a59c998a7d1778d86c6f",
+    "/chunks/admin.js": "/chunks/admin.js?id=5294b188df3920d615fd",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=ca2d2a0b50c409eea580",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=2d52fc8e939196f7ff16",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=1d731f1c4a9daecb2a99",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js?id=5841d65172536a8a9bdc",
     "/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=bcec1c96b2248aa0d451",
-    "/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=3738074ab881dca86f00",
+    "/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=aed3b5d5e9b9788fc901",
     "/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=481af22bd60333fd4ce1",
     "/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=510e6c1b1017a73a40a6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=61e970ffb679245686c3",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=26a26c5593b41f794d32",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=728162e02985ae793938",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=2650bff27ff135868aef",
     "/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=aa284736dda7647d5c9e",
     "/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=6bd4516589f23ec25ae6",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=b1123c792a51f9b3ec11",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=f0aa42244fb1c8e5974e",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=7219b58c1a1e2b56e9ca",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=8ebd11e9771b4f780bba",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=dad78e466c3c456cc434",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=0484e3ac2d8ba983953a",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=736f885ac022b5571dd7",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=78e0397a4838145a6c79",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=c0888489dad7dffe00a7",
     "/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=38b2085e829a84df0e5f",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=77ea2e394c4f00f72633",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=8d801efa2056a977810f",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=5ad84de6090be8706c25",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=47202a90d27229c18568",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=a16bef3e89f926038ac6",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=910637a55d144a8edaae",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=80a8d22b3b4bf997babf",
     "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js?id=107a78323eef0c1d4c81",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=c1c3c1db41ba14773e0b",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=962ff97d6592b29574d2",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=d89e1295d8dbd07858b7",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=a6dae0b5bed2ac300522",
     "/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=55135fff8801bdf735c4",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=782e7ef35b43f548081d",
-    "/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=0391ad036c47d999f159",
-    "/chunks/database.js": "/chunks/database.js?id=33edcd852e2a3bfc9cc5",
+    "/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=1ed3a7818d9f904975c0",
+    "/chunks/database.js": "/chunks/database.js?id=0c6acc17960dbbf52e29",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=253ce639751cc8799458",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=ead6700b73c697df655c",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=3977252278c2d609449d",
     "/chunks/files.js": "/chunks/files.js?id=a4f88b13671ef8b37818",
     "/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=64ac90ff8ae7d3ee3ed1",
     "/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=2f2e1987e91a74932dcb",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=44dd372c3414f407ed37",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=8e13225bf4eda83750fc",
     "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=b05098463fa6c39f9a8e",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=ff0431daf69e651d2785",
     "/chunks/invitation.js": "/chunks/invitation.js?id=c9cd3541ee362ae8d5f7",
     "/chunks/invoices.js": "/chunks/invoices.js?id=8cf63565e1e854db7305",
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ea129760157c8e44f324",
     "/chunks/not-found.js": "/chunks/not-found.js?id=034287ee0ecb036320d3",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=bbfdb6395b246b5fe2ac",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=7ca5818ed80a238091ae",
     "/chunks/pages.js": "/chunks/pages.js?id=f5c86b24fcbe15b15d1d",
     "/chunks/plan.js": "/chunks/plan.js?id=052940a7395f559b7c60",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=0e4874a6246590cbab60",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=2e6aabaa1486066981a3",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=5d326a130e1320173c87",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=84e6bae7c7a78b376fd3",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=24a9a66699c014e7bdee",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=36f5ad70d43c837644cb",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=a9c2cc16215004822f4d",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=865c61f0ad5c02045349",
     "/chunks/plans.js": "/chunks/plans.js?id=1dd67aa61e7482424e6d",
-    "/chunks/platform.js": "/chunks/platform.js?id=70dde39b81895cdfc044",
+    "/chunks/platform.js": "/chunks/platform.js?id=44ed2bf47235b69b61c7",
     "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js": "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js?id=8656b69a97cace919251",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=1f06e264a058b1baac7d",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=e10f4637f079008e5d87",
     "/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=7d983dfdc91de607d737",
-    "/chunks/profile.js": "/chunks/profile.js?id=2bb61bbc6be8c360e121",
+    "/chunks/profile.js": "/chunks/profile.js?id=8abf481ae271193981cb",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=22f629caf127051898e9",
-    "/chunks/settings.js": "/chunks/settings.js?id=a0e43eb3da79ad785fc5",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=9d0c13810831c7d4f8dc",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=3ef52128c0ebb1270c63",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=48a5d905b02e8ddacc70",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=acc794e18e23c233312a",
+    "/chunks/settings.js": "/chunks/settings.js?id=c5190d68a948d7ac468b",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=e790399c3a9603f19f1b",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=b7245d7c706b34608f6b",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=9decf768ce0631bbd783",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=38a54ecbe68314add389",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=9a1352324cbee9630496",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=b1e1ae3cff004140701e",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=e67e12955133c57194d1",
@@ -83,24 +83,24 @@
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=f2fb680ebf4873ff4436",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=04b378323ff1494fa85d",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=0307551ea7ad8e9bd3c2",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=36a8753c24f8f158ce67",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=4e1f6100f020469f0b56",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=b027fb7b37088b17451b",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=ed4bd5bcf44162d9290a",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=651c25f263156a115fb0",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=abb4bf292f15532bb41e",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8ac19b3fcfd57d79e5b1",
     "/chunks/team-folders.js": "/chunks/team-folders.js?id=0e69f4432e968cc512f9",
     "/chunks/trash.js": "/chunks/trash.js?id=5fe84aadd8729e68849e",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=0cfd5b8c3a4ea27109d2",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=37d49ff61bc07f1bb1ac",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=8bd237c632018a537d76",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=eaa1dc25ba7372205d20",
-    "/chunks/user.js": "/chunks/user.js?id=fe26116ebc97069cf7f9",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=496316cd7d2578cbaddf",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=b79d4353ab916775e845",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=adadc2cbc0ed9b28cc97",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=1fbc176e99de43c5d36d",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=5dae45c9401b4692b642",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=8c109607668830f45060",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=c337938c53b404b7b632",
+    "/chunks/user.js": "/chunks/user.js?id=24100ba3c089f04cbdd6",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=f1c6a91fd6b14a2f6ec7",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=2c0fed8b4f490c5d7dbd",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=57d78ad1c876a2c007f1",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=b8b52fc2dd1511cf8389",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=b0bf0f0584a27c209381",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=1b084ff6ad88f525a198",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=370b3df08b2ee39bf6ac",
-    "/chunks/users.js": "/chunks/users.js?id=8bd8edb68fbc5c7808c1",
+    "/chunks/users.js": "/chunks/users.js?id=6deee497a896c8dc2560",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8",
     "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712",
@@ -173,5 +173,115 @@
     "/chunks/app-index.4fc6837b351fd69c5701.hot-update.js": "/chunks/app-index.4fc6837b351fd69c5701.hot-update.js",
     "/chunks/app-index.3faa5068880b330b36b9.hot-update.js": "/chunks/app-index.3faa5068880b330b36b9.hot-update.js",
     "/chunks/app-index.2b6c8ef988f4750d340d.hot-update.js": "/chunks/app-index.2b6c8ef988f4750d340d.hot-update.js",
-    "/chunks/app-index.c1cf0678b3fa7d050594.hot-update.js": "/chunks/app-index.c1cf0678b3fa7d050594.hot-update.js"
+    "/chunks/app-index.c1cf0678b3fa7d050594.hot-update.js": "/chunks/app-index.c1cf0678b3fa7d050594.hot-update.js",
+    "/chunks/users.c3da2f076a846c1a6236.hot-update.js": "/chunks/users.c3da2f076a846c1a6236.hot-update.js",
+    "/chunks/users.dd9854cc598a2b32866f.hot-update.js": "/chunks/users.dd9854cc598a2b32866f.hot-update.js",
+    "/chunks/users.a008493461b572ab10f0.hot-update.js": "/chunks/users.a008493461b572ab10f0.hot-update.js",
+    "/chunks/users.f794fd8165d0df051fe6.hot-update.js": "/chunks/users.f794fd8165d0df051fe6.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.62349e7f0eea737e55d0.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.62349e7f0eea737e55d0.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.1494e87f3c3ec374abcc.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.1494e87f3c3ec374abcc.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.a83d314b320966ba1093.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.a83d314b320966ba1093.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.4372d1098504ba3ce033.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.4372d1098504ba3ce033.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.fe2b74f079a0172b2461.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.fe2b74f079a0172b2461.hot-update.js",
+    "/chunks/user.40c824cb045a7fd96617.hot-update.js": "/chunks/user.40c824cb045a7fd96617.hot-update.js",
+    "/js/main.269db9c16de6d0f41535.hot-update.js": "/js/main.269db9c16de6d0f41535.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~71789596.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~71789596.js?id=90e7bf80f06d6650bebf",
+    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~4d17e655.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~4d17e655.js?id=19c6effcaae833cfdf51",
+    "/chunks/user.269db9c16de6d0f41535.hot-update.js": "/chunks/user.269db9c16de6d0f41535.hot-update.js",
+    "/js/main.cba239d5fb22027a766f.hot-update.js": "/js/main.cba239d5fb22027a766f.hot-update.js",
+    "/chunks/user.cba239d5fb22027a766f.hot-update.js": "/chunks/user.cba239d5fb22027a766f.hot-update.js",
+    "/chunks/user.aaad6fff1210f28b1134.hot-update.js": "/chunks/user.aaad6fff1210f28b1134.hot-update.js",
+    "/chunks/user.41f2e67701938ebe1a6e.hot-update.js": "/chunks/user.41f2e67701938ebe1a6e.hot-update.js",
+    "/chunks/user.cd41fe2465cec18a4352.hot-update.js": "/chunks/user.cd41fe2465cec18a4352.hot-update.js",
+    "/chunks/user.407abe28eac344f41e28.hot-update.js": "/chunks/user.407abe28eac344f41e28.hot-update.js",
+    "/chunks/user-detail.81e9939cfc163abef281.hot-update.js": "/chunks/user-detail.81e9939cfc163abef281.hot-update.js",
+    "/chunks/user-detail.ed7c62cce5813eac2a76.hot-update.js": "/chunks/user-detail.ed7c62cce5813eac2a76.hot-update.js",
+    "/chunks/user-detail.e15c462a9cac2d28e3a0.hot-update.js": "/chunks/user-detail.e15c462a9cac2d28e3a0.hot-update.js",
+    "/chunks/user-detail.53615c274757917a7952.hot-update.js": "/chunks/user-detail.53615c274757917a7952.hot-update.js",
+    "/chunks/user-detail.69836700037d035e79d3.hot-update.js": "/chunks/user-detail.69836700037d035e79d3.hot-update.js",
+    "/chunks/user-detail.4bccbe2128072e803d92.hot-update.js": "/chunks/user-detail.4bccbe2128072e803d92.hot-update.js",
+    "/chunks/admin.073afecec3e2a402b2b2.hot-update.js": "/chunks/admin.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/admin-account.073afecec3e2a402b2b2.hot-update.js": "/chunks/admin-account.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.073afecec3e2a402b2b2.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-appearance.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-appearance.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-billings.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-billings.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-email.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-email.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-index.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-index.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-language.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-language.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-others.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-others.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-payments.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-payments.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/app-setup.073afecec3e2a402b2b2.hot-update.js": "/chunks/app-setup.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/billings-detail.073afecec3e2a402b2b2.hot-update.js": "/chunks/billings-detail.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/contact-us.073afecec3e2a402b2b2.hot-update.js": "/chunks/contact-us.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/database.073afecec3e2a402b2b2.hot-update.js": "/chunks/database.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/environment-setup.073afecec3e2a402b2b2.hot-update.js": "/chunks/environment-setup.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/installation-disclaimer.073afecec3e2a402b2b2.hot-update.js": "/chunks/installation-disclaimer.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/page-edit.073afecec3e2a402b2b2.hot-update.js": "/chunks/page-edit.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/plan-create.073afecec3e2a402b2b2.hot-update.js": "/chunks/plan-create.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/plan-delete.073afecec3e2a402b2b2.hot-update.js": "/chunks/plan-delete.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/plan-settings.073afecec3e2a402b2b2.hot-update.js": "/chunks/plan-settings.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/plan-subscribers.073afecec3e2a402b2b2.hot-update.js": "/chunks/plan-subscribers.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/platform.073afecec3e2a402b2b2.hot-update.js": "/chunks/platform.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/platform~chunks/shared.073afecec3e2a402b2b2.hot-update.js": "/chunks/platform~chunks/shared.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/profile.073afecec3e2a402b2b2.hot-update.js": "/chunks/profile.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/settings.073afecec3e2a402b2b2.hot-update.js": "/chunks/settings.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/settings-create-payment-methods.073afecec3e2a402b2b2.hot-update.js": "/chunks/settings-create-payment-methods.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/settings-invoices.073afecec3e2a402b2b2.hot-update.js": "/chunks/settings-invoices.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/settings-password.073afecec3e2a402b2b2.hot-update.js": "/chunks/settings-password.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/settings-payment-methods.073afecec3e2a402b2b2.hot-update.js": "/chunks/settings-payment-methods.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/status-check.073afecec3e2a402b2b2.hot-update.js": "/chunks/status-check.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/stripe-credentials.073afecec3e2a402b2b2.hot-update.js": "/chunks/stripe-credentials.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/subscription-plans.073afecec3e2a402b2b2.hot-update.js": "/chunks/subscription-plans.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/upgrade-billing.073afecec3e2a402b2b2.hot-update.js": "/chunks/upgrade-billing.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/upgrade-plan.073afecec3e2a402b2b2.hot-update.js": "/chunks/upgrade-plan.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-create.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-create.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-delete.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-delete.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-detail.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-detail.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-invoices.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-invoices.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-password.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-password.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/user-storage.073afecec3e2a402b2b2.hot-update.js": "/chunks/user-storage.073afecec3e2a402b2b2.hot-update.js",
+    "/chunks/admin.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/admin.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/admin-account.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/admin-account.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-appearance.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-appearance.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-billings.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-billings.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-email.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-email.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-index.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-index.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-language.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-language.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-others.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-others.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-payments.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-payments.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/app-setup.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/app-setup.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/billings-detail.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/billings-detail.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/contact-us.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/contact-us.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/database.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/database.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/environment-setup.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/environment-setup.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/installation-disclaimer.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/installation-disclaimer.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/page-edit.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/page-edit.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/plan-create.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/plan-create.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/plan-delete.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/plan-delete.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/plan-settings.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/plan-settings.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/plan-subscribers.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/plan-subscribers.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/platform~chunks/shared.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/platform~chunks/shared.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/profile.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/profile.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/settings-create-payment-methods.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/settings-create-payment-methods.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/settings-invoices.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/settings-invoices.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/settings-password.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/settings-password.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/settings-payment-methods.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/settings-payment-methods.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/status-check.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/status-check.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/stripe-credentials.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/stripe-credentials.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/subscription-plans.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/subscription-plans.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/upgrade-plan.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/upgrade-plan.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-create.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-create.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-delete.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-delete.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-detail.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-detail.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-invoices.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-invoices.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-password.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-password.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-storage.18cd9e5e51bbe33aaad9.hot-update.js": "/chunks/user-storage.18cd9e5e51bbe33aaad9.hot-update.js",
+    "/chunks/user-delete.fb55d0afd1e3120adc6d.hot-update.js": "/chunks/user-delete.fb55d0afd1e3120adc6d.hot-update.js",
+    "/chunks/user-password.25e989ed3fc1da822579.hot-update.js": "/chunks/user-password.25e989ed3fc1da822579.hot-update.js",
+    "/chunks/user.5d459aa12b99e74443f9.hot-update.js": "/chunks/user.5d459aa12b99e74443f9.hot-update.js",
+    "/chunks/user.8147559ef64f20c457b0.hot-update.js": "/chunks/user.8147559ef64f20c457b0.hot-update.js",
+    "/chunks/user.a57643db5e2532f28c66.hot-update.js": "/chunks/user.a57643db5e2532f28c66.hot-update.js",
+    "/chunks/user.1d312004a3b95d3f99b0.hot-update.js": "/chunks/user.1d312004a3b95d3f99b0.hot-update.js",
+    "/chunks/user.47aeb624caff9279062a.hot-update.js": "/chunks/user.47aeb624caff9279062a.hot-update.js",
+    "/chunks/user.78da4d817aa2c69d91b0.hot-update.js": "/chunks/user.78da4d817aa2c69d91b0.hot-update.js"
 }
diff --git a/resources/js/components/Others/Tables/DatatableWrapper.vue b/resources/js/components/Others/Tables/DatatableWrapper.vue
index ea42e051..f59bcfb2 100644
--- a/resources/js/components/Others/Tables/DatatableWrapper.vue
+++ b/resources/js/components/Others/Tables/DatatableWrapper.vue
@@ -4,6 +4,7 @@
             <thead class="table-header">
             <tr>
                 <th
+					class=""
                     v-for="(column, index) in columns"
                     @click="sort(column.field, column.sortable)"
                     :key="index"
@@ -390,7 +391,6 @@ export default {
 
 .paginator-wrapper {
     margin-top: 30px;
-    margin-bottom: 40px;
     display: flex;
     justify-content: space-between;
     align-items: center;
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 81bce8b6..a8640a0d 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -1,33 +1,18 @@
 <template>
-    <div id="single-page">
-        <div id="page-content">
-            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
-            <PageHeader :title="$t($router.currentRoute.meta.title)"/>
+    <div class="pr-6 w-full overflow-x-hidden relative" style="background: rgba(244, 245, 246, 0.6)">
 
-            <div class="content-page">
-
-                <!--Table tools-->
-                <div class="table-tools">
-                    <div class="buttons">
-                        <router-link :to="{name: 'UserCreate'}">
-                            <MobileActionButton icon="user-plus">
-                                {{ $t('admin_page_user.create_user.submit') }}
-                            </MobileActionButton>
-                        </router-link>
-                    </div>
-                </div>
-
-                <!--Datatable-->
-                <DatatableWrapper @init="isLoading = false" api="/api/admin/users" :paginator="true" :columns="columns" class="table table-users">
+		<div class="card shadow-card lg:mt-6 mt-4">
+			<!--Datatable-->
+			<DatatableWrapper @init="isLoading = false" api="/api/admin/users" :paginator="true" :columns="columns" class="table table-users">
                     <template slot-scope="{ row }">
                         <tr>
                             <td style="min-width: 320px">
                                 <router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
                                     <DatatableCellImage
-                                            :image="row.data.relationships.settings.data.attributes.avatar.sm"
-                                            :title="row.data.relationships.settings.data.attributes.name"
-                                            :description="row.data.attributes.email"
-                                    />
+										:image="row.data.relationships.settings.data.attributes.avatar.sm"
+										:title="row.data.relationships.settings.data.attributes.name"
+										:description="row.data.attributes.email"
+									/>
                                 </router-link>
                             </td>
                             <td>
@@ -77,8 +62,26 @@
                         </tr>
                     </template>
                 </DatatableWrapper>
+		</div>
+
+<!--        <div id="page-content">
+
+            <div class="content-page">
+
+                &lt;!&ndash;Table tools&ndash;&gt;
+                <div class="table-tools">
+                    <div class="buttons">
+                        <router-link :to="{name: 'UserCreate'}">
+                            <MobileActionButton icon="user-plus">
+                                {{ $t('admin_page_user.create_user.submit') }}
+                            </MobileActionButton>
+                        </router-link>
+                    </div>
+                </div>
+
+
             </div>
-        </div>
+        </div>-->
         <div id="loader" v-if="isLoading">
             <Spinner></Spinner>
         </div>
diff --git a/resources/js/views/Admin/Users/User.vue b/resources/js/views/Admin/Users/User.vue
index 809d8d81..b9c82d91 100644
--- a/resources/js/views/Admin/Users/User.vue
+++ b/resources/js/views/Admin/Users/User.vue
@@ -1,88 +1,39 @@
 <template>
-    <div id="single-page">
-        <div id="page-content" v-if="! isLoading">
-            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
-            <PageHeader :can-back="true" :title="$t($router.currentRoute.meta.title)"/>
-            <div class="content-page">
+    <div class="pr-6 w-full overflow-x-hidden relative" style="background: rgba(244, 245, 246, 0.6)">
 
-                <!--User thumbnail-->
-                <div class="user-thumbnail">
-                    <div class="avatar">
-                        <img :src="user.data.relationships.settings.data.attributes.avatar.sm" :alt="user.data.relationships.settings.data.attributes.name">
-                        <!--<img :src="user.data.attributes.avatar" :alt="user.data.attributes.name" class="blurred">-->
-                    </div>
-                    <div class="info">
-                        <b class="name">
-                            {{ user.data.relationships.settings.data.attributes.name }}
-                            <ColorLabel color="purple">
-                                {{ user.data.attributes.role }}
-                            </ColorLabel>
-                        </b>
-                        <span class="email">{{ user.data.attributes.email }}</span>
-                    </div>
-                </div>
+		<div id="page-content" v-if="! isLoading">
+			<!--Page Tab links-->
+			<div class="card shadow-card pt-4 pb-0 lg:mt-6 mt-4 sticky top-0 z-10">
+				<div class="user-thumbnail">
+					<div class="avatar">
+						<img :src="user.data.relationships.settings.data.attributes.avatar.sm" :alt="user.data.relationships.settings.data.attributes.name">
+						<!--<img :src="user.data.attributes.avatar" :alt="user.data.attributes.name" class="blurred">-->
+					</div>
+					<div class="info">
+						<b class="name">
+							{{ user.data.relationships.settings.data.attributes.name }}
+							<ColorLabel color="purple">
+								{{ user.data.attributes.role }}
+							</ColorLabel>
+						</b>
+						<span class="email">{{ user.data.attributes.email }}</span>
+					</div>
+				</div>
 
-                <!--Page Tab links-->
-                <div class="menu-list-wrapper horizontal">
-                    <router-link replace :to="{name: 'UserDetail'}" class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <user-icon size="17"></user-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.detail') }}
-                        </div>
-                    </router-link>
+				<router-link
+					class="inline-block text-sm font-bold px-4 py-5 border-b-2 border-transparent border-bottom-theme"
+					:class="{'text-theme': $router.currentRoute.name === page.route, 'text-gray-600': $router.currentRoute.name !== page.route}"
+					v-for="(page, i) in pages"
+					:to="{name: page.route}"
+					:key="i"
+					replace
+				>
+					{{ page.title }}
+				</router-link>
+			</div>
 
-                    <router-link replace :to="{name: 'UserStorage'}" class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <hard-drive-icon size="17"></hard-drive-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.storage') }}
-                        </div>
-                    </router-link>
-
-                    <router-link v-if="config.isSaaS" replace :to="{name: 'UserSubscription'}" class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <credit-card-icon size="17"></credit-card-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.subscription') }}
-                        </div>
-                    </router-link>
-
-                    <router-link v-if="config.isSaaS" replace :to="{name: 'UserInvoices'}" class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <file-text-icon size="17"></file-text-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.invoices') }}
-                        </div>
-                    </router-link>
-
-                    <router-link replace :to="{name: 'UserPassword'}" class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <lock-icon size="17"></lock-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.password') }}
-                        </div>
-                    </router-link>
-
-                    <router-link replace :to="{name: 'UserDelete'}" v-if="admin && user.data.relationships.settings.data.attributes.name !== admin.data.relationships.settings.data.attributes.name"
-                                 class="menu-list-item link border-bottom-theme">
-                        <div class="icon text-theme">
-                            <trash2-icon size="17"></trash2-icon>
-                        </div>
-                        <div class="label text-theme">
-                            {{ $t('admin_page_user.tabs.delete') }}
-                        </div>
-                    </router-link>
-                </div>
-
-                <!--Router Content-->
-                <router-view :user="user" @reload-user="fetchUser"/>
-            </div>
+			<!--Router Content-->
+			<router-view :user="user" @reload-user="fetchUser"/>
         </div>
         <div id="loader" v-if="isLoading">
             <Spinner></Spinner>
@@ -127,6 +78,32 @@
             return {
                 isLoading: true,
                 user: undefined,
+				pages: [
+					{
+						title: this.$t('admin_page_user.tabs.detail'),
+						route: 'UserDetail',
+					},
+					{
+						title: this.$t('admin_page_user.tabs.storage'),
+						route: 'UserStorage',
+					},
+					{
+						title: this.$t('admin_page_user.tabs.subscription'),
+						route: 'UserSubscription',
+					},
+					{
+						title: this.$t('Transactions'),
+						route: 'UserInvoices',
+					},
+					{
+						title: this.$t('admin_page_user.tabs.password'),
+						route: 'UserPassword',
+					},
+					{
+						title: this.$t('Delete Account'),
+						route: 'UserDelete',
+					},
+				]
             }
         },
         methods: {
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
index 0d1f4784..35abe59e 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
@@ -1,7 +1,10 @@
 <template>
-    <PageTab v-if="user" class="form-fixed-width">
-        <PageTabGroup>
-            <FormLabel>{{ $t('user_box_delete.title') }}</FormLabel>
+    <PageTab v-if="user">
+
+		<div class="card shadow-card">
+            <FormLabel>
+				{{ $t('user_box_delete.title') }}
+			</FormLabel>
             <InfoBox>
                 <p>{{ $t('user_box_delete.description') }}</p>
             </InfoBox>
@@ -12,7 +15,7 @@
                         <input v-model="userName"
                                :placeholder="$t('admin_page_user.placeholder_delete_user')"
                                type="text"
-                               class="focus-border-theme"
+                               class="focus-border-theme input-dark"
                                :class="{'is-error': errors[0]}"
                         />
                         <ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit"
@@ -23,6 +26,9 @@
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
             </ValidationObserver>
+		</div>
+
+        <PageTabGroup>
         </PageTabGroup>
     </PageTab>
 </template>
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
index 222e76b0..9f586e9c 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
@@ -1,8 +1,8 @@
 <template>
-    <PageTab class="form-fixed-width">
+    <PageTab>
 
         <!--Change role-->
-        <PageTabGroup>
+		<div class="card shadow-card">
             <FormLabel>
                 {{ $t('user_box_role.title') }}
             </FormLabel>
@@ -25,41 +25,41 @@
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
             </ValidationObserver>
-        </PageTabGroup>
+		</div>
 
-        <!--Personal Information-->
-        <PageTabGroup>
-            <div class="form block-form">
+		<div class="card shadow-card">
+			<div class="form block-form">
                 <FormLabel>{{ $t('admin_page_user.label_person_info') }}</FormLabel>
 
-                <!--Email-->
+				<!--Email-->
                 <div class="block-wrapper">
                     <label>{{ $t('page_registration.label_email') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.attributes.email"
-                               :placeholder="$t('page_registration.placeholder_email')"
-                               type="email"
-                               disabled
-                        />
+							   :placeholder="$t('page_registration.placeholder_email')"
+							   type="email"
+							   class="focus-border-theme input-dark"
+							   disabled
+						/>
                     </div>
                 </div>
 
-                <!--Name-->
+				<!--Name-->
                 <div class="block-wrapper">
                     <label>{{ $t('page_registration.label_name') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.name"
-                               :placeholder="$t('page_registration.placeholder_name')"
-                               type="text"
-                               disabled
-                        />
+							   :placeholder="$t('page_registration.placeholder_name')"
+							   type="text"
+							   class="focus-border-theme input-dark"
+							   disabled
+						/>
                     </div>
                 </div>
             </div>
-        </PageTabGroup>
+		</div>
 
-        <!--Billing Information-->
-        <PageTabGroup v-if="config.isSaaS">
+		<div class="card shadow-card">
             <div class="form block-form">
                 <FormLabel>{{ $t('user_settings.title_billing') }}</FormLabel>
 
@@ -67,27 +67,30 @@
                     <label>{{ $t('user_settings.name') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.name"
-                               type="text"
-                               disabled
-                        />
+							   type="text"
+							   class="focus-border-theme input-dark"
+							   disabled
+						/>
                     </div>
                 </div>
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.address') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.address"
-                               type="text"
-                               disabled
-                        />
+							   type="text"
+							   disabled
+							   class="focus-border-theme input-dark"
+						/>
                     </div>
                 </div>
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.country') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.country"
-                               type="text"
-                               disabled
-                        />
+							   type="text"
+							   disabled
+							   class="focus-border-theme input-dark"
+						/>
                     </div>
                 </div>
                 <div class="wrapper-inline">
@@ -95,18 +98,20 @@
                         <label>{{ $t('user_settings.city') }}:</label>
                         <div class="input-wrapper">
                             <input :value="user.data.relationships.settings.data.attributes.city"
-                                   type="text"
-                                   disabled
-                            />
+								   type="text"
+								   disabled
+								   class="focus-border-theme input-dark"
+							/>
                         </div>
                     </div>
                     <div class="block-wrapper">
                         <label>{{ $t('user_settings.postal_code') }}:</label>
                         <div class="input-wrapper">
                             <input :value="user.data.relationships.settings.data.attributes.postal_code"
-                                   type="text"
-                                   disabled
-                            />
+								   type="text"
+								   disabled
+								   class="focus-border-theme input-dark"
+							/>
                         </div>
                     </div>
                 </div>
@@ -114,22 +119,24 @@
                     <label>{{ $t('user_settings.state') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.state"
-                               type="text"
-                               disabled
-                        />
+							   type="text"
+							   disabled
+							   class="focus-border-theme input-dark"
+						/>
                     </div>
                 </div>
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.phone_number') }}:</label>
                     <div class="input-wrapper">
                         <input :value="user.data.relationships.settings.data.attributes.phone_number"
-                               type="text"
-                               disabled
-                        />
+							   type="text"
+							   disabled
+							   class="focus-border-theme input-dark"
+						/>
                     </div>
                 </div>
             </div>
-        </PageTabGroup>
+		</div>
     </PageTab>
 </template>
 
diff --git a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
index e304999a..eb0f7e32 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserPassword.vue
@@ -1,6 +1,6 @@
 <template>
-    <PageTab class="form-fixed-width">
-        <PageTabGroup>
+    <PageTab>
+		<div class="card shadow-card">
             <FormLabel>
                 {{ $t('user_box_password.title') }}
             </FormLabel>
@@ -11,7 +11,7 @@
                         :disabled="isSendingRequest" type="submit" button-style="theme" class="submit-button">
                 {{ $t('admin_page_user.send_password_link') }}
             </ButtonBase>
-        </PageTabGroup>
+		</div>
     </PageTab>
 </template>
 
diff --git a/resources/sass/vuefilemanager/_forms.scss b/resources/sass/vuefilemanager/_forms.scss
index 98117731..a6569cdb 100644
--- a/resources/sass/vuefilemanager/_forms.scss
+++ b/resources/sass/vuefilemanager/_forms.scss
@@ -148,7 +148,7 @@ input[type="email"] {
   }
 
   &[disabled] {
-    background: white;
+    //background: white;
     color: rgba($text, 0.8);
     -webkit-text-fill-color: rgba($text, 0.8);
     opacity: 1;
@@ -308,7 +308,7 @@ input[type="color"] {
     }
 
     &[disabled] {
-      background: $dark_mode_foreground;
+      //background: $dark_mode_foreground;
       color: rgba($dark_mode_text_secondary, 0.8);
       -webkit-text-fill-color: rgba($dark_mode_text_secondary, 0.8);
     }