diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d30772ed..ca837e07 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,10 +2,10 @@
     "/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=5b0c074ed63a8a36f3da",
+    "/chunks/admin.js": "/chunks/admin.js?id=be84f411ff8674fbe000",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=55f9b983b9aa60c21a62",
-    "/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-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=b6966627bd253eda63ba",
+    "/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=d7a8e5b5b913858da427",
     "/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=0ae7b3d840e0e20fe358",
     "/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=f3da1167c5f8c0239987",
@@ -14,18 +14,18 @@
     "/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=70acb48a6c7627c1de7a",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=001053430ac0df82ee35",
     "/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=b929de231c24d2e82389",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=c0b15222a239b25c24e9",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=6c55fe0a70ae4080ae1c",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=00c6bdc16f52d5df6ef8",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=dec310a7272f3f6a457e",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=5daa9f12633f047cb5ba",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=1f66e29d0c2149fcf205",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=98e63873fecda1e6517a",
     "/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=9c049ba80e8a889146be",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=f0f2dec48dc193f73197",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=cfa4b677c26e18833535",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=ea20de0e14b30a79ea50",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=db54f40c07bdfb86b81e",
     "/chunks/app-setup.js": "/chunks/app-setup.js?id=459d95c0256c819ce4bf",
     "/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",
@@ -50,7 +50,7 @@
     "/chunks/invoices.js": "/chunks/invoices.js?id=dde37879c074c8bf91b1",
     "/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=e6d84410fcb6c94d0ad7",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=1b019a18fb41cef1ad32",
     "/chunks/pages.js": "/chunks/pages.js?id=10510081613e26cb3d84",
     "/chunks/plan.js": "/chunks/plan.js?id=052940a7395f559b7c60",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=72e4ef277bb881d5cadf",
@@ -62,14 +62,14 @@
     "/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=aafbc2aab40dc434335a",
     "/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=85ffe0dda3e34d9a0382",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=e53203fcbbdb49585b2e",
+    "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=bbc30423365438c0ae48",
     "/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=b7a593ddda1ac39edc94",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0920151cdeb1c2bdb36a",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=f73f0faf411f750a1c07",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=2dd5de2492c4526bf0e0",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=39b32fc7ac6671f97e1a",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=979e74627582832e7a79",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=9a1352324cbee9630496",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=b1e1ae3cff004140701e",
@@ -93,12 +93,12 @@
     "/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=7ee9b84ffed9bf544997",
     "/chunks/user.js": "/chunks/user.js?id=5c5421f40243bcba9c23",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=0f1bce798ff38795cc9a",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=0c8b02ca42410202543f",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=03bfe48eb0673efa5001",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=ec233bbaf96b1ee0c9a6",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=242721d191f7c2643be5",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=bec7fcd9314bd3b85bd7",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=a03cdaa3511d88acdd97",
     "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=bb30538ad15465e45248",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=ca852034b42f7ffb5693",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=370b3df08b2ee39bf6ac",
     "/chunks/users.js": "/chunks/users.js?id=bd78d2a3c0c6253da984",
     "/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",
@@ -827,5 +827,83 @@
     "/chunks/app-language.51c75c91befc0cb11b65.hot-update.js": "/chunks/app-language.51c75c91befc0cb11b65.hot-update.js",
     "/chunks/app-language.8b9de85cd95d62b3e900.hot-update.js": "/chunks/app-language.8b9de85cd95d62b3e900.hot-update.js",
     "/chunks/app-language.7d3c27cbe97dc64f1556.hot-update.js": "/chunks/app-language.7d3c27cbe97dc64f1556.hot-update.js",
-    "/chunks/app-language.d85d645aaa3e8b181d05.hot-update.js": "/chunks/app-language.d85d645aaa3e8b181d05.hot-update.js"
+    "/chunks/app-language.d85d645aaa3e8b181d05.hot-update.js": "/chunks/app-language.d85d645aaa3e8b181d05.hot-update.js",
+    "/chunks/app-language.6bc604465bc193bc5153.hot-update.js": "/chunks/app-language.6bc604465bc193bc5153.hot-update.js",
+    "/chunks/app-language.83562309600f8084b6f0.hot-update.js": "/chunks/app-language.83562309600f8084b6f0.hot-update.js",
+    "/chunks/admin.917be9d14f5dcdd024ce.hot-update.js": "/chunks/admin.917be9d14f5dcdd024ce.hot-update.js",
+    "/chunks/admin.0b50e4116b87bd54b98e.hot-update.js": "/chunks/admin.0b50e4116b87bd54b98e.hot-update.js",
+    "/chunks/admin.f5063add0ecb8eeaa70d.hot-update.js": "/chunks/admin.f5063add0ecb8eeaa70d.hot-update.js",
+    "/chunks/admin.ea7c68c7a19af563615f.hot-update.js": "/chunks/admin.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-appearance.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-appearance.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-billings.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-billings.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-email.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-email.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-index.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-index.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-language.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-language.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-others.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-others.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/app-payments.ea7c68c7a19af563615f.hot-update.js": "/chunks/app-payments.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/page-edit.ea7c68c7a19af563615f.hot-update.js": "/chunks/page-edit.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/profile~chunks/settings-password.ea7c68c7a19af563615f.hot-update.js": "/chunks/profile~chunks/settings-password.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/user-create.ea7c68c7a19af563615f.hot-update.js": "/chunks/user-create.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/user-delete.ea7c68c7a19af563615f.hot-update.js": "/chunks/user-delete.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/user-detail.ea7c68c7a19af563615f.hot-update.js": "/chunks/user-detail.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/user-storage.ea7c68c7a19af563615f.hot-update.js": "/chunks/user-storage.ea7c68c7a19af563615f.hot-update.js",
+    "/chunks/admin.6049bb2dac43c6b966aa.hot-update.js": "/chunks/admin.6049bb2dac43c6b966aa.hot-update.js",
+    "/chunks/admin.edb1bfd123d571ecaa88.hot-update.js": "/chunks/admin.edb1bfd123d571ecaa88.hot-update.js",
+    "/chunks/admin.82457c7e4abdb7e724df.hot-update.js": "/chunks/admin.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-appearance.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-appearance.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-billings.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-billings.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-email.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-email.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-index.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-index.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-language.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-language.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-others.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-others.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-payments.82457c7e4abdb7e724df.hot-update.js": "/chunks/app-payments.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/page-edit.82457c7e4abdb7e724df.hot-update.js": "/chunks/page-edit.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/profile~chunks/settings-password.82457c7e4abdb7e724df.hot-update.js": "/chunks/profile~chunks/settings-password.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/user-create.82457c7e4abdb7e724df.hot-update.js": "/chunks/user-create.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/user-delete.82457c7e4abdb7e724df.hot-update.js": "/chunks/user-delete.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/user-detail.82457c7e4abdb7e724df.hot-update.js": "/chunks/user-detail.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/user-storage.82457c7e4abdb7e724df.hot-update.js": "/chunks/user-storage.82457c7e4abdb7e724df.hot-update.js",
+    "/chunks/app-appearance.7104e783c3169090ce45.hot-update.js": "/chunks/app-appearance.7104e783c3169090ce45.hot-update.js",
+    "/chunks/app-index.7104e783c3169090ce45.hot-update.js": "/chunks/app-index.7104e783c3169090ce45.hot-update.js",
+    "/chunks/app-language.7104e783c3169090ce45.hot-update.js": "/chunks/app-language.7104e783c3169090ce45.hot-update.js",
+    "/chunks/app-others.7104e783c3169090ce45.hot-update.js": "/chunks/app-others.7104e783c3169090ce45.hot-update.js",
+    "/chunks/app-payments.7104e783c3169090ce45.hot-update.js": "/chunks/app-payments.7104e783c3169090ce45.hot-update.js",
+    "/chunks/page-edit.7104e783c3169090ce45.hot-update.js": "/chunks/page-edit.7104e783c3169090ce45.hot-update.js",
+    "/chunks/settings-password.7104e783c3169090ce45.hot-update.js": "/chunks/settings-password.7104e783c3169090ce45.hot-update.js",
+    "/chunks/app-language.7db157e3d29e99a541b5.hot-update.js": "/chunks/app-language.7db157e3d29e99a541b5.hot-update.js",
+    "/chunks/app-language.1a351a8902cbffd299fc.hot-update.js": "/chunks/app-language.1a351a8902cbffd299fc.hot-update.js",
+    "/chunks/admin.412db234b72661907c79.hot-update.js": "/chunks/admin.412db234b72661907c79.hot-update.js",
+    "/chunks/app-language.0ad09e005ee8556e976d.hot-update.js": "/chunks/app-language.0ad09e005ee8556e976d.hot-update.js",
+    "/chunks/app-others.9dbb46a04d02d37041ef.hot-update.js": "/chunks/app-others.9dbb46a04d02d37041ef.hot-update.js",
+    "/chunks/app-others.955e220c8397719094f3.hot-update.js": "/chunks/app-others.955e220c8397719094f3.hot-update.js",
+    "/chunks/app-appearance.d5fb9f11d4bfa0fcecad.hot-update.js": "/chunks/app-appearance.d5fb9f11d4bfa0fcecad.hot-update.js",
+    "/chunks/app-billings.d3cfabf8263463a37baa.hot-update.js": "/chunks/app-billings.d3cfabf8263463a37baa.hot-update.js",
+    "/chunks/app-billings.0fae146cdf337f6ca85f.hot-update.js": "/chunks/app-billings.0fae146cdf337f6ca85f.hot-update.js",
+    "/chunks/app-index.eb710fdb10f137d740bf.hot-update.js": "/chunks/app-index.eb710fdb10f137d740bf.hot-update.js",
+    "/chunks/user-detail.5cc8d9e8a8aaeef1980a.hot-update.js": "/chunks/user-detail.5cc8d9e8a8aaeef1980a.hot-update.js",
+    "/chunks/user-detail.7065c214c6a9998d8316.hot-update.js": "/chunks/user-detail.7065c214c6a9998d8316.hot-update.js",
+    "/chunks/user-detail.43584ddd8c8e8f57b0c8.hot-update.js": "/chunks/user-detail.43584ddd8c8e8f57b0c8.hot-update.js",
+    "/chunks/user-storage.de1bdcbb171cc5039e47.hot-update.js": "/chunks/user-storage.de1bdcbb171cc5039e47.hot-update.js",
+    "/chunks/user-delete.c39437417f8a438f4a4e.hot-update.js": "/chunks/user-delete.c39437417f8a438f4a4e.hot-update.js",
+    "/chunks/page-edit.69213651323a5278c7da.hot-update.js": "/chunks/page-edit.69213651323a5278c7da.hot-update.js",
+    "/chunks/profile.e1cce1570db4052e3378.hot-update.js": "/chunks/profile.e1cce1570db4052e3378.hot-update.js",
+    "/chunks/profile.c0473544733ead274f8f.hot-update.js": "/chunks/profile.c0473544733ead274f8f.hot-update.js",
+    "/chunks/profile.93de4b1aed70ced14e00.hot-update.js": "/chunks/profile.93de4b1aed70ced14e00.hot-update.js",
+    "/chunks/settings-password.a7122090fb704f133a1a.hot-update.js": "/chunks/settings-password.a7122090fb704f133a1a.hot-update.js",
+    "/chunks/settings-password.c4ec903bd7549dfca09f.hot-update.js": "/chunks/settings-password.c4ec903bd7549dfca09f.hot-update.js",
+    "/chunks/settings-password.d059bbb03a6f5a1e1a09.hot-update.js": "/chunks/settings-password.d059bbb03a6f5a1e1a09.hot-update.js",
+    "/chunks/settings-password.a2dd0cc58cd70116fb77.hot-update.js": "/chunks/settings-password.a2dd0cc58cd70116fb77.hot-update.js",
+    "/chunks/settings-password.b6a6d5c3e05afc600309.hot-update.js": "/chunks/settings-password.b6a6d5c3e05afc600309.hot-update.js",
+    "/chunks/app-appearance.3466624c8f4008e44207.hot-update.js": "/chunks/app-appearance.3466624c8f4008e44207.hot-update.js",
+    "/chunks/app-appearance.35890197752447af1f64.hot-update.js": "/chunks/app-appearance.35890197752447af1f64.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.ad1cae5f6dc2ccab96e6.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.ad1cae5f6dc2ccab96e6.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.106829010160be24a23d.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.106829010160be24a23d.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.a85423bcecc8460a72f2.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.a85423bcecc8460a72f2.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.87f56c93e9d4aad168ea.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.87f56c93e9d4aad168ea.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.8c486c3d6de59d9fc505.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.8c486c3d6de59d9fc505.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.c7d530f7d38f7cebf716.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.c7d530f7d38f7cebf716.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.d3bd17252a10b1932507.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.d3bd17252a10b1932507.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.1d4f4577db164e3a170e.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.1d4f4577db164e3a170e.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.b61a3b505c44b3f80373.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.b61a3b505c44b3f80373.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.71a6d49227badf336e40.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.71a6d49227badf336e40.hot-update.js"
 }
diff --git a/resources/js/components/Admin/AppInputSwitch.vue b/resources/js/components/Admin/AppInputSwitch.vue
index 3d66923a..5cb6a5f2 100644
--- a/resources/js/components/Admin/AppInputSwitch.vue
+++ b/resources/js/components/Admin/AppInputSwitch.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="mb-7 flex justify-between w-full">
+	<div :class="{'mb-7': !isLast}" class="flex justify-between w-full">
 
 		<!--Label for input-->
 		<div class="leading-5">
@@ -28,6 +28,7 @@
 		name: 'AppInputSwitch',
 		props: [
 			'description',
+			'isLast',
 			'title',
 			'error',
 		]
diff --git a/resources/js/components/Admin/AppInputText.vue b/resources/js/components/Admin/AppInputText.vue
index 2c5570cf..a5c03a31 100644
--- a/resources/js/components/Admin/AppInputText.vue
+++ b/resources/js/components/Admin/AppInputText.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="mb-7">
+	<div :class="{'mb-7': !isLast}">
 
 		<!--Label for input-->
 		<label class="text-sm font-bold text-gray-700 mb-1.5 block">
@@ -24,6 +24,7 @@
 		name: 'AppInputText',
 		props: [
 			'description',
+			'isLast',
 			'title',
 			'error',
 		]
diff --git a/resources/js/components/Others/CreateLanguage.vue b/resources/js/components/Others/CreateLanguage.vue
index a7543bf5..ffd9d550 100644
--- a/resources/js/components/Others/CreateLanguage.vue
+++ b/resources/js/components/Others/CreateLanguage.vue
@@ -9,18 +9,16 @@
 
             <!--Form to set sharing-->
             <ValidationObserver @submit.prevent="createLanguage" ref="createForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
-
-                <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Language Locale" rules="required" v-slot="{ errors }">
-                    <label class="input-label">{{ $t('select_locale') }}:</label>
-                    <SelectInput v-model="form.locale" :options="locales" :placeholder="$t('select_language_locale')" :isError="errors[0]" />
-                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-                </ValidationProvider>
-
-                <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Language Name" rules="required" v-slot="{ errors }">
-                    <label class="input-label">{{ $t('locale_name') }}:</label>
-                    <input v-model="form.name" :class="{'is-error': errors[0]}" type="text" ref="input" class="focus-border-theme" :placeholder="$t('type_language_name')">
-                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-                </ValidationProvider>
+				<ValidationProvider tag="div" mode="passive" name="Language Locale" rules="required" v-slot="{ errors }">
+					<AppInputText :title="$t('select_locale')" :error="errors[0]">
+						<SelectInput v-model="form.locale" :options="locales" :placeholder="$t('select_language_locale')" :isError="errors[0]" />
+					</AppInputText>
+				</ValidationProvider>
+				<ValidationProvider tag="div" mode="passive" name="Language Name" rules="required" v-slot="{ errors }">
+					<AppInputText :title="$t('locale_name')" :error="errors[0]" :is-last="true">
+						<input v-model="form.name" :class="{'is-error': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('type_language_name')">
+					</AppInputText>
+				</ValidationProvider>
             </ValidationObserver>
         </PopupContent>
 
@@ -47,6 +45,7 @@
 </template>
 
 <script>
+import AppInputText from "../Admin/AppInputText";
 import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
 import PopupWrapper from '/resources/js/components/Others/Popup/PopupWrapper'
 import PopupActions from '/resources/js/components/Others/Popup/PopupActions'
@@ -63,6 +62,7 @@ export default {
     components: {
         ValidationProvider,
         ValidationObserver,
+		AppInputText,
         PopupWrapper,
         PopupActions,
         PopupContent,
diff --git a/resources/js/components/Others/Forms/ImageInput.vue b/resources/js/components/Others/Forms/ImageInput.vue
index 013a474c..44baa815 100644
--- a/resources/js/components/Others/Forms/ImageInput.vue
+++ b/resources/js/components/Others/Forms/ImageInput.vue
@@ -18,7 +18,7 @@
         />
 
         <div class="dropzone-message" v-show="! isData">
-            <image-icon size="28" class="icon-upload text-theme"></image-icon>
+            <image-icon size="28" class="icon-upload text-theme mx-auto mb-1"/>
             <span class="dropzone-title">
                 {{ $t('input_image.title') }}
             </span>
diff --git a/resources/js/components/Others/Forms/SelectInput.vue b/resources/js/components/Others/Forms/SelectInput.vue
index fedd4198..15d23fe1 100644
--- a/resources/js/components/Others/Forms/SelectInput.vue
+++ b/resources/js/components/Others/Forms/SelectInput.vue
@@ -2,7 +2,7 @@
     <div class="select">
 
         <!--Area-->
-        <div class="input-area" :class="{'is-active': isOpen, 'is-error': isError}" @click="openMenu">
+        <div class="input-area bg-light-background rounded-lg" :class="{'is-active': isOpen, 'is-error': isError}" @click="openMenu">
 
             <!--If is selected-->
             <div class="selected" v-if="selected">
@@ -23,9 +23,9 @@
 
         <!--Options-->
         <transition name="slide-in">
-            <div class="input-options" v-if="isOpen">
+            <div class="input-options rounded-lg" v-if="isOpen">
                 <div v-if="options.length > 5" class="select-search">
-                    <input v-model="query" ref="search" type="text" :placeholder="$t('select_search_placeholder')" class="search-input focus-border-theme">
+                    <input v-model="query" ref="search" type="text" :placeholder="$t('select_search_placeholder')" class="search-input focus-border-theme rounded-lg">
                 </div>
                 <ul class="option-list">
                     <li class="option-item" @click="selectOption(option)" v-for="(option, i) in optionList" :key="i">
@@ -131,7 +131,6 @@
             background: $light_background;
             @include transition(150ms);
             @include font-size(14);
-            border-radius: 8px;
             padding: 13px 20px;
             appearance: none;
             font-weight: 700;
@@ -143,7 +142,6 @@
     .input-options {
         box-shadow: 0 5px 15px rgba(0, 0, 0, 0.12);
         background: white;
-        border-radius: 8px;
         position: absolute;
         overflow: hidden;
         top: 65px;
@@ -174,11 +172,8 @@
         border-style: solid;
         border-color: transparent;
         justify-content: space-between;
-        box-shadow: 0 1px 5px rgba(0, 0, 0, 0.12);
-        //background: $light_mode_input_background;
         @include transition(150ms);
         align-items: center;
-        border-radius: 8px;
         padding: 13px 20px;
         display: flex;
         outline: 0;
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
index a645d461..bb0ef85a 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
@@ -13,7 +13,7 @@
 				<input @input="$updateText('/admin/settings', 'app_description', app.description)" v-model="app.description" :placeholder="$t('admin_settings.appearance.description_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 
-			<AppInputSwitch :title="$t('color_theme')" :description="$t('color_theme_description')">
+			<AppInputSwitch :title="$t('color_theme')" :description="$t('color_theme_description')" :is-last="true">
 				<input @input="$updateText('/admin/settings', 'app_color', app.color)" v-model="app.color" :placeholder="$t('admin_settings.appearance.title_plac')" type="color"/>
 			</AppInputSwitch>
 		</div>
@@ -21,39 +21,26 @@
 			<FormLabel>
 				{{ $t('Branding') }}
 			</FormLabel>
-			<div class="block-wrapper">
-				<label>{{ $t('admin_settings.appearance.logo') }}:</label>
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Logo" v-slot="{ errors }">
-					<ImageInput @input="$updateImage('/admin/settings', 'app_logo', app.logo)" :image="$getImage(app.logo)" v-model="app.logo" :error="errors[0]"/>
-				</ValidationProvider>
-			</div>
-			<div class="block-wrapper">
-				<label>{{ $t('admin_settings.appearance.logo_horizontal') }}:</label>
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Logo Horizontal" v-slot="{ errors }">
-					<ImageInput @input="$updateImage('/admin/settings', 'app_logo_horizontal', app.logo_horizontal)" :image="$getImage(app.logo_horizontal)"
-								v-model="app.logo_horizontal" :error="errors[0]"/>
-				</ValidationProvider>
-			</div>
-			<div class="block-wrapper">
-				<label>{{ $t('admin_settings.appearance.favicon') }}:</label>
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Favicon" v-slot="{ errors }">
-					<ImageInput @input="$updateImage('/admin/settings', 'app_favicon', app.favicon)" :image="$getImage(app.favicon)" v-model="app.favicon" :error="errors[0]"/>
-				</ValidationProvider>
-			</div>
-			<div class="block-wrapper">
-				<label>{{ $t('og_image') }}:</label>
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Favicon" v-slot="{ errors }">
-					<ImageInput @input="$updateImage('/admin/settings', 'app_og_image', app.og_image)" :image="$getImage(app.og_image)" v-model="app.og_image" :error="errors[0]"/>
-					<small class="input-help">{{ $t('og_image_description') }}</small>
-				</ValidationProvider>
-			</div>
-			<div class="block-wrapper">
-				<label>{{ $t('app_touch_icon') }}:</label>
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Favicon" v-slot="{ errors }">
-					<ImageInput @input="$updateImage('/admin/settings', 'app_touch_icon', app.touch_icon)" :image="$getImage(app.touch_icon)" v-model="app.touch_icon" :error="errors[0]"/>
-					<small class="input-help">{{ $t('app_touch_icon_description') }}</small>
-				</ValidationProvider>
-			</div>
+
+			<AppInputText :title="$t('admin_settings.appearance.logo')">
+				<ImageInput @input="$updateImage('/admin/settings', 'app_logo', app.logo)" :image="$getImage(app.logo)" v-model="app.logo"/>
+			</AppInputText>
+
+			<AppInputText :title="$t('admin_settings.appearance.logo_horizontal')">
+				<ImageInput @input="$updateImage('/admin/settings', 'app_logo_horizontal', app.logo_horizontal)" :image="$getImage(app.logo_horizontal)" v-model="app.logo_horizontal"/>
+			</AppInputText>
+
+			<AppInputText :title="$t('admin_settings.appearance.favicon')">
+				<ImageInput @input="$updateImage('/admin/settings', 'app_favicon', app.favicon)" :image="$getImage(app.favicon)" v-model="app.favicon"/>
+			</AppInputText>
+
+			<AppInputText :title="$t('og_image')" :description="$t('og_image_description')">
+				<ImageInput @input="$updateImage('/admin/settings', 'app_og_image', app.og_image)" :image="$getImage(app.og_image)" v-model="app.og_image"/>
+			</AppInputText>
+
+			<AppInputText :title="$t('app_touch_icon')" :description="$t('app_touch_icon_description')">
+				<ImageInput @input="$updateImage('/admin/settings', 'app_touch_icon', app.touch_icon)" :image="$getImage(app.touch_icon)" v-model="app.touch_icon"/>
+			</AppInputText>
 		</div>
     </PageTab>
 </template>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Billings.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Billings.vue
index 32e2d12e..5eea8fd3 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Billings.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Billings.vue
@@ -9,7 +9,7 @@
 				<input @input="$updateText('/admin/settings', 'billing_name', billingInformation.billing_name)" v-model="billingInformation.billing_name" :placeholder="$t('admin_settings.billings.company_name_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 
-			<AppInputText :title="$t('admin_settings.billings.vat')">
+			<AppInputText :title="$t('admin_settings.billings.vat')" :is-last="true">
 				<input @input="$updateText('/admin/settings', 'billing_vat_number', billingInformation.billing_vat_number)" v-model="billingInformation.billing_vat_number" :placeholder="$t('admin_settings.billings.vat_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 		</div>
@@ -40,7 +40,7 @@
 				<input @input="$updateText('/admin/settings', 'billing_state', billingInformation.billing_state)" v-model="billingInformation.billing_state" :placeholder="$t('admin_settings.billings.state_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 
-			<AppInputText :title="$t('admin_settings.billings.phone_number')">
+			<AppInputText :title="$t('admin_settings.billings.phone_number')" :is-last="true">
 				<input @input="$updateText('/admin/settings', 'billing_phone_number', billingInformation.billing_phone_number)" v-model="billingInformation.billing_phone_number" :placeholder="$t('admin_settings.billings.phone_number_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 		</div>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
index fea954af..3a7c20a4 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
@@ -9,7 +9,7 @@
 						{{ $t('Homepage') }}
 					</FormLabel>
 
-					<AppInputSwitch :title="$t('Allow Homepage')" :description="$t('When this is turned on, your visitors can visit your default homepage.')">
+					<AppInputSwitch :title="$t('Allow Homepage')" :description="$t('When this is turned on, your visitors can visit your default homepage.')" :is-last="true">
 						<SwitchInput @input="$updateText('/admin/settings', 'allow_homepage', app.allow_homepage)" v-model="app.allow_homepage" class="switch" :state="app.allow_homepage"/>
 					</AppInputSwitch>
 				</div>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
index 198d7915..f1a0cd35 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
@@ -34,7 +34,7 @@
 				/>
 			</AppInputSwitch>
 
-			<AppInputSwitch :title="$t('admin_settings.others.allow_user_verification')" :description="$t('admin_settings.others.allow_user_verification_help')">
+			<AppInputSwitch :title="$t('admin_settings.others.allow_user_verification')" :description="$t('admin_settings.others.allow_user_verification_help')" :is-last="true">
 				<SwitchInput
 					@input="$updateText('/admin/settings', 'user_verification', app.userVerification)"
 					v-model="app.userVerification"
@@ -60,7 +60,7 @@
 				<textarea rows="2" @input="$updateText('/admin/settings', 'mimetypes_blacklist', app.mimetypesBlacklist, true)" v-model="app.mimetypesBlacklist" :placeholder="$t('admin_settings.others.mimetypes_blacklist_plac')" type="text" class="focus-border-theme input-dark" />
 			</AppInputText>
 
-			<AppInputText :title="$t('admin_settings.others.upload_limit')" :description="$t('admin_settings.others.upload_limit_help')">
+			<AppInputText :title="$t('admin_settings.others.upload_limit')" :description="$t('admin_settings.others.upload_limit_help')" :is-last="true">
 				<input @input="$updateText('/admin/settings', 'upload_limit', app.uploadLimit, true)" v-model="app.uploadLimit" :placeholder="$t('admin_settings.others.upload_limit_plac')" type="number" min="0" step="1" class="focus-border-theme input-dark" />
 			</AppInputText>
 		</div>
diff --git a/resources/js/views/Admin/Languages/Language.vue b/resources/js/views/Admin/Languages/Language.vue
index 9ffd69e3..e939bcd6 100644
--- a/resources/js/views/Admin/Languages/Language.vue
+++ b/resources/js/views/Admin/Languages/Language.vue
@@ -50,63 +50,60 @@
 			</div>
 
 			<!--Content-->
-			<div class="form block-form content">
+			<div class="dynamic-content">
 
-				<div class="dynamic-content">
+				<Spinner v-if="! selectedLanguage" class="spinner" />
 
-					<Spinner v-if="! selectedLanguage" class="spinner" />
+				<div v-if="selectedLanguage">
 
-					<div v-if="selectedLanguage">
+					<!--Language Settings-->
+					<div v-if="! isSearching" class="card shadow-card">
+						<FormLabel icon="settings">
+							{{ $t('language_settings') }}
+						</FormLabel>
 
-						<!--Language Settings-->
-						<div v-if="! isSearching" class="card shadow-card">
-							<FormLabel icon="settings">
-								{{ $t('language_settings') }}
-							</FormLabel>
+						<ValidationProvider tag="div" mode="passive" name="Language name" rules="required" v-slot="{ errors }">
+							<AppInputText :title="$t('language_name')" :error="errors[0]">
+								<input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name" :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme input-dark" />
+							</AppInputText>
+						</ValidationProvider>
 
-							<ValidationProvider tag="div" mode="passive" name="Language name" rules="required" v-slot="{ errors }">
-								<AppInputText :title="$t('language_name')" :error="errors[0]">
-									<input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name" :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme input-dark" />
-								</AppInputText>
-							</ValidationProvider>
+						<AppInputSwitch :title="$t('set_as_default_language')" :description="$t('If this language is set as default, app will appear in this language for all users.')" :is-last="true">
+							<SwitchInput
+								@input="setDefaultLanguage"
+								class="switch"
+								:class="{'disable-switch': selectedLanguage.data.attributes.locale === this.defaultLanguageLocale }"
+								:state="selectedLanguage.data.attributes.locale === this.defaultLanguageLocale"
+							/>
+						</AppInputSwitch>
+					</div>
 
-							<AppInputSwitch :title="$t('set_as_default_language')" :description="$t('If this language is set as default, app will appear in this language for all users.')">
-								<SwitchInput
-									@input="setDefaultLanguage"
-									class="switch"
-									:class="{'disable-switch': selectedLanguage.data.attributes.locale === this.defaultLanguageLocale }"
-									:state="selectedLanguage.data.attributes.locale === this.defaultLanguageLocale"
-								/>
-							</AppInputSwitch>
+					<div v-if="selectedLanguage" class="card shadow-card">
+						<!--Translations-->
+						<FormLabel>
+							{{ $t('edit_translations') }}
+						</FormLabel>
+
+						<InfoBox>
+							<p>Please preserve in your translations special string variables defined in format as <b class="text-theme">:variable</b> or <b class="text-theme">{variable}</b>.</p>
+						</InfoBox>
+
+						<!--Inline Search for mobile-->
+						<div class="sticky top-0 z-10 mb-8">
+							<SearchInput v-model="query" @reset-query="query = ''" />
 						</div>
 
-						<div class="card shadow-card">
-							<!--Translations-->
-							<FormLabel>
-								{{ $t('edit_translations') }}
-							</FormLabel>
-
-							<InfoBox>
-								<p>Please preserve in your translations special string variables defined in format as <b class="text-theme">:variable</b> or <b class="text-theme">{variable}</b>.</p>
-							</InfoBox>
-
-							<!--Inline Search for mobile-->
-							<div class="sticky top-0 z-10 mb-8">
-								<SearchInput v-model="query" @reset-query="query = ''" />
-							</div>
-
-							<ValidationProvider tag="div" name="Language string" rules="required" v-slot="{ errors }">
-								<AppInputText :title="referenceTranslations[key]" :error="errors[0]" v-for="(translation, key) in translationList" :key="key">
-									<textarea
-										v-model="selectedLanguage.data.attributes.translations[key]"
-										@input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
-										:rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
-										class="focus-border-theme input-dark"
-										:class="{'is-error': errors[0]}"
-									></textarea>
-								</AppInputText>
-							</ValidationProvider>
-						</div>
+						<ValidationProvider tag="div" name="Language string" rules="required" v-slot="{ errors }">
+							<AppInputText :title="referenceTranslations[key]" :error="errors[0]" v-for="(translation, key) in translationList" :key="key" :is-last="true">
+								<textarea
+									v-model="selectedLanguage.data.attributes.translations[key]"
+									@input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
+									:rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
+									class="focus-border-theme input-dark"
+									:class="{'is-error': errors[0]}"
+								></textarea>
+							</AppInputText>
+						</ValidationProvider>
 					</div>
 				</div>
 			</div>
diff --git a/resources/js/views/Admin/Pages/PageEdit.vue b/resources/js/views/Admin/Pages/PageEdit.vue
index c945ec42..5882a77c 100644
--- a/resources/js/views/Admin/Pages/PageEdit.vue
+++ b/resources/js/views/Admin/Pages/PageEdit.vue
@@ -14,7 +14,7 @@
 			<AppInputText :title="$t('admin_pages.form.slug')">
 				<input v-model="page.data.attributes.slug" type="text" class="focus-border-theme input-dark" disabled/>
 			</AppInputText>
-			<AppInputText :title="$t('admin_pages.form.content')">
+			<AppInputText :title="$t('admin_pages.form.content')" :is-last="true">
 				<textarea
 					@input="$updateText('/admin/pages/' + $route.params.slug, 'content', page.data.attributes.content)"
 					v-model="page.data.attributes.content"
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
index 3121a8fe..6cab305f 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
@@ -8,7 +8,7 @@
 		</InfoBox>
 		<ValidationObserver ref="deleteUser" @submit.prevent="deleteUser" v-slot="{ invalid }" tag="form">
 			<ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="User name" rules="required">
-				<AppInputText :title="$t('admin_page_user.label_delete_user', {user: user.data.relationships.settings.data.attributes.name})" :error="errors[0]">
+				<AppInputText :title="$t('admin_page_user.label_delete_user', {user: user.data.relationships.settings.data.attributes.name})" :error="errors[0]" :is-last="true">
 					<div class="flex space-x-4">
 						<input v-model="userName"
 							   :placeholder="$t('admin_page_user.placeholder_delete_user')"
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
index 3f9251a9..31881c04 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
@@ -10,7 +10,7 @@
             </InfoBox>
             <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')" :error="errors[0]">
+					<AppInputText :title="$t('admin_page_user.select_role')" :error="errors[0]" :is-last="true">
 						<div class="flex space-x-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">
@@ -33,7 +33,7 @@
 				/>
             </AppInputText>
 			<!--Name-->
-            <AppInputText :title="$t('page_registration.label_name')">
+            <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')"
 					   type="text"
@@ -88,7 +88,7 @@
 					   class="focus-border-theme input-dark"
 				/>
             </AppInputText>
-            <AppInputText :title="$t('user_settings.phone_number')">
+            <AppInputText :title="$t('user_settings.phone_number')" :is-last="true">
                 <input :value="user.data.relationships.settings.data.attributes.phone_number"
 					   type="text"
 					   disabled
diff --git a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
index 6f6da1dd..56fff1de 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
@@ -10,7 +10,7 @@
             </InfoBox>
             <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')" :error="errors[0]">
+					<AppInputText :title="$t('admin_page_user.label_change_capacity')" :error="errors[0]" :is-last="true">
 						<div class="flex space-x-4">
 							<input v-model="capacity"
 								   :placeholder="$t('admin_page_user.label_change_capacity')"
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index a94c8f96..fdc7eb7c 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -4,13 +4,13 @@
             <FormLabel icon="smartphone">
                 {{ $t('2fa.settings.title') }}
             </FormLabel>
-            <AppInputSwitch :title="$t('popup_2fa.switch_title')" :description="$t('popup_2fa.switch_info')">
+            <AppInputSwitch :title="$t('popup_2fa.switch_title')" :description="$t('popup_2fa.switch_info')" :is-last="user && ! user.data.attributes.two_factor_authentication">
                 <SwitchInput @click.native.prevent.stop="open2faPopup"
 							 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')">
+            <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">
                 <ButtonBase
 					class="popup-button"
 					button-style="secondary"
diff --git a/resources/js/views/User/Settings.vue b/resources/js/views/User/Settings.vue
index 0f12cc22..e2dbf0b6 100644
--- a/resources/js/views/User/Settings.vue
+++ b/resources/js/views/User/Settings.vue
@@ -10,7 +10,7 @@
 					   class="focus-border-theme input-dark"
 			   >
             </AppInputText>
-            <AppInputText :title="$t('page_registration.label_name')">
+            <AppInputText :title="$t('page_registration.label_name')" :is-last="true">
                 <input @keyup="changeUserName"
 					   v-model="userInfo.name"
 					   :placeholder="$t('page_registration.placeholder_name')"
@@ -21,7 +21,7 @@
         </div>
         <div class="card shadow-card">
             <FormLabel>{{ $t('user_settings.timezone') }}</FormLabel>
-            <AppInputText :title="$t('GMT')">
+            <AppInputText :title="$t('GMT')" :is-last="true">
                 <SelectInput @input="$updateText('/user/settings', 'timezone', userInfo.timezone)"
 							 v-model="userInfo.timezone"
 							 :default="userInfo.timezone"
@@ -83,7 +83,7 @@
 					   class="focus-border-theme input-dark"
 				/>
             </AppInputText>
-            <AppInputText :title="$t('user_settings.phone_number')">
+            <AppInputText :title="$t('user_settings.phone_number')" :is-last="true">
                 <input @keyup="$updateText('/user/settings', 'phone_number', billingInfo.phone_number)"
 					   v-model="billingInfo.phone_number"
 					   :placeholder="$t('user_settings.phone_number_plac')"