diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 82f6da89..70688604 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,37 +3,37 @@
     "/css/app.css": "/css/app.css",
     "/css/tailwind.css": "/css/tailwind.css",
     "/chunks/admin.js": "/chunks/admin.js?id=6b44ad76c944f71d4bad",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=1d297064a7b806655c53",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=c706acc7bc21ea113660",
     "/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",
+    "/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=7b94fd0c332ed326530d",
     "/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=c93d93c96f9924e4517d",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=a6c18598d0dfd4d0998f",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=89a951dcb6727075a599",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=35d0f09c983f483f2bdb",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=0d6c4be667e46ea1303e",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6998004ef5927a2ab6e0",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~449d985a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~449d985a.js?id=a0a21868aa49efc3bf97",
     "/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=87266e580e0abf1170c5",
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=714f7a9f33e15fe89b4a",
     "/chunks/app-email.js": "/chunks/app-email.js?id=7419fedbf3228988067e",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=92460d58caa98b834d98",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=1a0d0ad8e9f2a9313705",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=344ea83ba3aa8f3ae970",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=b3e66600fb1c378c5512",
     "/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-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~c80ea79c.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~c80ea79c.js?id=625c65b01d8f3f5635ec",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=6ccb3ea160cc946eb687",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=a2b26a48088e0ce75341",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=fa7246494a7bc0c815f3",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=8f4efc8ee29baf23b846",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=2a96295eef59bd6c8921",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=d08c8db88e7c09d691a7",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c8d1d79a1311936f1a6f",
     "/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=90001da58614ded6d2dc",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=3d0bbcd0c36d74bf739a",
     "/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=45dac5af51764ff6be94",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=f95d2d00f960c9c47d7c",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~5475de6f.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~5475de6f.js?id=c5c36cfe8a9f7e56aa25",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans.js?id=d62ce026c0c13d14242f",
     "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js?id=f72a1b2efde61b53a755",
@@ -49,33 +49,33 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=1579259e826aa89fb00a",
     "/chunks/invitation.js": "/chunks/invitation.js?id=c9cd3541ee362ae8d5f7",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=0357a77fa3c891ee12fe",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=1590f8c2408a33901f5a",
     "/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=d116a63e3c59bc0a5133",
-    "/chunks/pages.js": "/chunks/pages.js?id=57cb88433843d50803cc",
-    "/chunks/plan.js": "/chunks/plan.js?id=414fb0906247ec3d9387",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=eedfd9e519057b807694",
+    "/chunks/pages.js": "/chunks/pages.js?id=32b25e76505ca1006934",
+    "/chunks/plan.js": "/chunks/plan.js?id=4fa6f87c04a875875d36",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=356baaa5a3526092427f",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=0a4be2cbfb95daed83ee",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=a76effa1bd41a19581c9",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=da6e174d3ab5e6cb5293",
-    "/chunks/plans.js": "/chunks/plans.js?id=a03911a6f6001380f11b",
-    "/chunks/platform.js": "/chunks/platform.js?id=dc3c6677ab43d4475b66",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=58b35ab28597da974535",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=c07a2a970dc5414a7d51",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=5151a942550b58d3ba69",
+    "/chunks/plans.js": "/chunks/plans.js?id=0aa91553ed338315d39a",
+    "/chunks/platform.js": "/chunks/platform.js?id=e25d3e8c863a76737a4b",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=e64e3b67ccb89de9dd55",
     "/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=8688d9c7ff850e6989e6",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=c0dbc21fb8c789f0144a",
     "/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=2a9be45c14b5a06144d9",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=cacac1c92fcaa4f21f69",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=f0569e04bab9c71bde8d",
+    "/chunks/settings.js": "/chunks/settings.js?id=70a6590d0bd259002e3f",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=ebe216f521fadd86078d",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=ffbecee4f54c774adadb",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=4ed19fa578c63c0c50ce",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3a88e55341d1f1ffe12d",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=c1a4036392db4eea190f",
     "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js?id=cc6fd81d942730305129",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=fd27d71eb4f6b2194715",
-    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=e67e12955133c57194d1",
+    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=d6249b995bc889847a5d",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
     "/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87",
     "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=11188f25ddf9a240cc4f",
@@ -94,11 +94,11 @@
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=28dce4872f5b8c5e95f8",
     "/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=3f5da29c2cb7481872de",
+    "/chunks/user.js": "/chunks/user.js?id=96133c9c9650166985af",
     "/chunks/user-create.js": "/chunks/user-create.js?id=1d58b3cf93c7b3b90d9d",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=c0ea5194b4a4de8189dd",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=a55ae1a545a65b92511d",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=62fad2c159b7704cb15e",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=d029415204757a2d6ea1",
     "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=71b90f0987d1ebe7ead6",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=82038ce92ca5e1c9ae05",
@@ -415,7 +415,7 @@
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~29d9eb92.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~29d9eb92.js?id=695251c38c0884b45b81",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~3edf9278.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~3edf9278.js?id=c2a7d990d48dd8155cb3",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js?id=d89ebe03a6c9d01fe126",
-    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=c1eb38e3d20fdea1770f",
+    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5e90cd0bfdcbf4c9b38d",
     "/chunks/admin.182bab58ce8679f77c46.hot-update.js": "/chunks/admin.182bab58ce8679f77c46.hot-update.js",
     "/chunks/subscriptions.d68fcf7fd76ca845594c.hot-update.js": "/chunks/subscriptions.d68fcf7fd76ca845594c.hot-update.js",
     "/chunks/admin.36e4bde4e0f466b7928a.hot-update.js": "/chunks/admin.36e4bde4e0f466b7928a.hot-update.js",
@@ -495,5 +495,55 @@
     "/chunks/subscriptions.e34ca38624fb2551c54f.hot-update.js": "/chunks/subscriptions.e34ca38624fb2551c54f.hot-update.js",
     "/chunks/subscriptions.f3847317ea8b4ecfdedf.hot-update.js": "/chunks/subscriptions.f3847317ea8b4ecfdedf.hot-update.js",
     "/chunks/user-subscription.2071c966d4951e9ff366.hot-update.js": "/chunks/user-subscription.2071c966d4951e9ff366.hot-update.js",
-    "/chunks/user-invoices.15da7b2951d6ac860725.hot-update.js": "/chunks/user-invoices.15da7b2951d6ac860725.hot-update.js"
+    "/chunks/user-invoices.15da7b2951d6ac860725.hot-update.js": "/chunks/user-invoices.15da7b2951d6ac860725.hot-update.js",
+    "/chunks/settings-invoices.119a66ffe06e28696969.hot-update.js": "/chunks/settings-invoices.119a66ffe06e28696969.hot-update.js",
+    "/js/main.ec44921a2941db8c4bc3.hot-update.js": "/js/main.ec44921a2941db8c4bc3.hot-update.js",
+    "/chunks/invoices.ec44921a2941db8c4bc3.hot-update.js": "/chunks/invoices.ec44921a2941db8c4bc3.hot-update.js",
+    "/chunks/user-invoices.ec44921a2941db8c4bc3.hot-update.js": "/chunks/user-invoices.ec44921a2941db8c4bc3.hot-update.js",
+    "/chunks/subscriptions.74844abe8fc8e627ad90.hot-update.js": "/chunks/subscriptions.74844abe8fc8e627ad90.hot-update.js",
+    "/js/main.d50d6369394c1edc242c.hot-update.js": "/js/main.d50d6369394c1edc242c.hot-update.js",
+    "/chunks/plan-subscribers.d50d6369394c1edc242c.hot-update.js": "/chunks/plan-subscribers.d50d6369394c1edc242c.hot-update.js",
+    "/js/main.b09494be72cfc84628b3.hot-update.js": "/js/main.b09494be72cfc84628b3.hot-update.js",
+    "/chunks/plans.3bac10b78283590b1d11.hot-update.js": "/chunks/plans.3bac10b78283590b1d11.hot-update.js",
+    "/chunks/plans.45b8e9beed7295096103.hot-update.js": "/chunks/plans.45b8e9beed7295096103.hot-update.js",
+    "/chunks/plans.14da084af4fa000d4427.hot-update.js": "/chunks/plans.14da084af4fa000d4427.hot-update.js",
+    "/chunks/plan-settings.e4652dd414a11544cd63.hot-update.js": "/chunks/plan-settings.e4652dd414a11544cd63.hot-update.js",
+    "/chunks/plan-settings.0021fe190d8c22790c0e.hot-update.js": "/chunks/plan-settings.0021fe190d8c22790c0e.hot-update.js",
+    "/chunks/plan-settings.c9b27c591f664f824a85.hot-update.js": "/chunks/plan-settings.c9b27c591f664f824a85.hot-update.js",
+    "/chunks/plans.479a62ab9334cca52a75.hot-update.js": "/chunks/plans.479a62ab9334cca52a75.hot-update.js",
+    "/chunks/plan-settings.93c41bac6684768b28d6.hot-update.js": "/chunks/plan-settings.93c41bac6684768b28d6.hot-update.js",
+    "/chunks/plans.3409c1deefba28de1984.hot-update.js": "/chunks/plans.3409c1deefba28de1984.hot-update.js",
+    "/chunks/plans.465105c53a6c5398aa51.hot-update.js": "/chunks/plans.465105c53a6c5398aa51.hot-update.js",
+    "/chunks/plans.136835a05d27789992de.hot-update.js": "/chunks/plans.136835a05d27789992de.hot-update.js",
+    "/chunks/plans.a49871e214512243b055.hot-update.js": "/chunks/plans.a49871e214512243b055.hot-update.js",
+    "/chunks/plans.dc2012c97675151e2414.hot-update.js": "/chunks/plans.dc2012c97675151e2414.hot-update.js",
+    "/js/main.7550b7ad7b345c7d0503.hot-update.js": "/js/main.7550b7ad7b345c7d0503.hot-update.js",
+    "/chunks/dashboard.7550b7ad7b345c7d0503.hot-update.js": "/chunks/dashboard.7550b7ad7b345c7d0503.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=3e02dadbcc6a138f8ab2",
+    "/chunks/invoices.7550b7ad7b345c7d0503.hot-update.js": "/chunks/invoices.7550b7ad7b345c7d0503.hot-update.js",
+    "/chunks/pages.7550b7ad7b345c7d0503.hot-update.js": "/chunks/pages.7550b7ad7b345c7d0503.hot-update.js",
+    "/chunks/plans.7550b7ad7b345c7d0503.hot-update.js": "/chunks/plans.7550b7ad7b345c7d0503.hot-update.js",
+    "/chunks/subscriptions.7550b7ad7b345c7d0503.hot-update.js": "/chunks/subscriptions.7550b7ad7b345c7d0503.hot-update.js",
+    "/js/main.c0ecbcaf38150544ca1e.hot-update.js": "/js/main.c0ecbcaf38150544ca1e.hot-update.js",
+    "/chunks/settings.c0ecbcaf38150544ca1e.hot-update.js": "/chunks/settings.c0ecbcaf38150544ca1e.hot-update.js",
+    "/chunks/settings-password.c0ecbcaf38150544ca1e.hot-update.js": "/chunks/settings-password.c0ecbcaf38150544ca1e.hot-update.js",
+    "/vendors~chunks/settings.js": "/vendors~chunks/settings.js?id=0ad6bf4acae70c329adf",
+    "/js/main.24631efe84c7ad31e563.hot-update.js": "/js/main.24631efe84c7ad31e563.hot-update.js",
+    "/js/main.2b7d041f756228dc64c0.hot-update.js": "/js/main.2b7d041f756228dc64c0.hot-update.js",
+    "/chunks/user.17b31d78030a648528f9.hot-update.js": "/chunks/user.17b31d78030a648528f9.hot-update.js",
+    "/chunks/user.3b4e39d5b3c4d5cece2d.hot-update.js": "/chunks/user.3b4e39d5b3c4d5cece2d.hot-update.js",
+    "/chunks/user.34ead21543ae42237be2.hot-update.js": "/chunks/user.34ead21543ae42237be2.hot-update.js",
+    "/chunks/plan.ff910d8ebdad915783c7.hot-update.js": "/chunks/plan.ff910d8ebdad915783c7.hot-update.js",
+    "/chunks/plan.0281f99b19d7cb9851b2.hot-update.js": "/chunks/plan.0281f99b19d7cb9851b2.hot-update.js",
+    "/chunks/plan.fb2c7457628f4bec5b4f.hot-update.js": "/chunks/plan.fb2c7457628f4bec5b4f.hot-update.js",
+    "/chunks/plan-delete.d9b7bb17760fe383c8a2.hot-update.js": "/chunks/plan-delete.d9b7bb17760fe383c8a2.hot-update.js",
+    "/chunks/plan-delete.189b98dfa10c96ee8362.hot-update.js": "/chunks/plan-delete.189b98dfa10c96ee8362.hot-update.js",
+    "/chunks/plan-delete.6877869198642e55a187.hot-update.js": "/chunks/plan-delete.6877869198642e55a187.hot-update.js",
+    "/chunks/plan-delete.144e11b5f04827162cdf.hot-update.js": "/chunks/plan-delete.144e11b5f04827162cdf.hot-update.js",
+    "/chunks/invoices.4e62ec63b379faad0278.hot-update.js": "/chunks/invoices.4e62ec63b379faad0278.hot-update.js",
+    "/chunks/invoices.935143ab32e5ae3e93f7.hot-update.js": "/chunks/invoices.935143ab32e5ae3e93f7.hot-update.js",
+    "/js/main.7fcce007a830181b8076.hot-update.js": "/js/main.7fcce007a830181b8076.hot-update.js",
+    "/chunks/invoices.0fc3648804617ab3f456.hot-update.js": "/chunks/invoices.0fc3648804617ab3f456.hot-update.js",
+    "/chunks/invoices.3c88509d82835e292a67.hot-update.js": "/chunks/invoices.3c88509d82835e292a67.hot-update.js",
+    "/chunks/invoices.705b43cc74409c2e5b8f.hot-update.js": "/chunks/invoices.705b43cc74409c2e5b8f.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 28443d32..02d1db49 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -6,8 +6,6 @@
         <ToasterWrapper />
         <CookieDisclaimer />
 
-		<SelectPlanSubscriptionPopup />
-
         <!--Show spinner before translations is loaded-->
         <Spinner v-if="! isLoaded"/>
 
@@ -19,7 +17,6 @@
 </template>
 
 <script>
-import SelectPlanSubscriptionPopup from "./components/Subscription/SelectPlanSubscriptionPopup";
 import ToasterWrapper from '/resources/js/components/Others/Notifications/ToasterWrapper'
 import CookieDisclaimer from '/resources/js/components/Others/CookieDisclaimer'
 import Spinner from '/resources/js/components/FilesView/Spinner'
@@ -31,7 +28,6 @@ import {events} from './bus'
 export default {
     name: 'app',
     components: {
-		SelectPlanSubscriptionPopup,
         CookieDisclaimer,
         ToasterWrapper,
         Vignette,
@@ -135,7 +131,7 @@ export default {
 @import '/resources/sass/vuefilemanager/_mixins';
 
 .card {
-	@apply dark:bg-dark-foreground bg-white lg:p-8 p-6 rounded-lg lg:mb-6 mb-4
+	@apply dark:bg-dark-foreground bg-white lg:p-6 p-4 rounded-xl lg:mb-6 mb-4
 }
 
 .input-dark {
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 3154d5bd..6905c0f7 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -329,7 +329,7 @@ const FunctionHelpers = {
             }[driver]
         }
 
-        Vue.prototype.getSubscriptionStatusColor = function (status) {
+        Vue.prototype.$getSubscriptionStatusColor = function (status) {
 
             return {
                 'active': 'green',
@@ -338,6 +338,15 @@ const FunctionHelpers = {
             }[status]
         }
 
+        Vue.prototype.$getTransactionStatusColor = function (status) {
+
+            return {
+                'completed': 'green',
+                'cancelled': 'yellow',
+                'error': 'red',
+            }[status]
+        }
+
         Vue.prototype.$goToFileView = function (id) {
 
             let locations = {
diff --git a/resources/js/views/Admin/Invoices.vue b/resources/js/views/Admin/Invoices.vue
index 35fb326e..7125d781 100644
--- a/resources/js/views/Admin/Invoices.vue
+++ b/resources/js/views/Admin/Invoices.vue
@@ -16,7 +16,7 @@
 								</span>
 							</td>
 							<td>
-								<div class="flex items-center">
+								<div v-if="row.data.relationships.user" class="flex items-center">
 									<MemberAvatar
 										:is-border="false"
 										:size="36"
@@ -31,9 +31,12 @@
 										</span>
 									</div>
 								</div>
+								<span v-if="! row.data.relationships.user" class="text-xs text-gray-500 font-bold">
+									{{ $t('User was deleted') }}
+								</span>
 							</td>
 							<td>
-								<ColorLabel color="purple">
+								<ColorLabel :color="$getTransactionStatusColor(row.data.attributes.status)">
 									{{ row.data.attributes.status }}
 								</ColorLabel>
 							</td>
diff --git a/resources/js/views/Admin/Plans.vue b/resources/js/views/Admin/Plans.vue
index 579bcb32..a2631ebd 100644
--- a/resources/js/views/Admin/Plans.vue
+++ b/resources/js/views/Admin/Plans.vue
@@ -10,11 +10,11 @@
 			</div>
 
 			<!--Datatable-->
-            <DatatableWrapper @data="plans = $event" @init="isLoading = false" api="/api/subscriptions/plans" :paginator="true" :columns="columns">
+            <DatatableWrapper @data="plans = $event" @init="isLoading = false" api="/api/subscriptions/admin/plans" :paginator="true" :columns="columns">
                 <template slot-scope="{ row }">
                     <tr class="border-b dark:border-opacity-5 border-light border-dashed">
 						<td class="py-4">
-							<SwitchInput @input="changeStatus($event, row.data.id)" class="switch" :state="row.data.attributes.visible"/>
+							<SwitchInput @input="$updateInput(`/subscriptions/admin/plans/${row.data.id}`, 'visible', row.data.attributes.visible)" v-model="row.data.attributes.visible" class="switch" :state="row.data.attributes.visible"/>
 						</td>
                         <td>
 							<router-link class="text-sm font-bold" :to="{name: 'PlanSettings', params: {id: row.data.id}}">
@@ -163,11 +163,6 @@
                 ],
             }
         },
-        methods: {
-            changeStatus(val, id) {
-                this.$updateText('/subscription/plans/' + id, 'visible', val)
-            }
-        },
         created() {
             if (! this.config.stripe_public_key)
                 this.isLoading = false
diff --git a/resources/js/views/Admin/Plans/Plan.vue b/resources/js/views/Admin/Plans/Plan.vue
index 995bd941..c3905314 100644
--- a/resources/js/views/Admin/Plans/Plan.vue
+++ b/resources/js/views/Admin/Plans/Plan.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-		<div class="card shadow-card pb-0 sticky top-0 z-10">
+		<div v-if="plan" class="card shadow-card pb-0 sticky top-0 z-10">
 
 			<div class="mb-2">
 				<h1 class="font-bold text-xl">
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue
index 8b534248..f4e30671 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue
@@ -8,9 +8,9 @@
 		</InfoBox>
 		<ValidationObserver ref="deletePlan" @submit.prevent="deletePlan" v-slot="{ invalid }" tag="form">
 			<ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="Plan name" :rules="'required|is:' + plan.attributes.name">
-				<AppInputText :title="$t('admin_page_user.label_delete_user', {user: plan.attributes.name})" :is-last="true">
+				<AppInputText :title="$t('admin_page_user.label_delete_user', {user: plan.attributes.name})" :error="errors[0]" :is-last="true">
 					<div class="flex space-x-4">
-						<input v-model="planName" :placeholder="$t('admin_page_plans.form.name_delete_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme input-dark" />
+						<input v-model="planName" :placeholder="$t('admin_page_plans.form.name_delete_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
 						<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="danger" class="submit-button">
 							{{ $t('admin_page_plans.delete_plan_button') }}
 						</ButtonBase>
@@ -54,7 +54,6 @@
         },
         methods: {
             async deletePlan() {
-
                 // Validate fields
                 const isValid = await this.$refs.deletePlan.validate();
 
@@ -63,11 +62,7 @@
                 this.isSendingRequest = true
 
                 axios
-                    .post('/api/subscriptions/admin/plans/' + this.$route.params.id,
-                        {
-                            data: {
-                                name: this.planName
-                            },
+                    .post(`/api/subscriptions/admin/plans/${this.$route.params.id}`, {
                             _method: 'delete'
                         }
                     )
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
index fd61234c..0f89fdca 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
@@ -7,17 +7,17 @@
 
 			<!--Visible-->
 			<AppInputSwitch :title="$t('admin_page_plans.form.status')" :description="$t('admin_page_plans.form.status_help')">
-				<SwitchInput @input="$updateInput('/subscriptions/plans/' + $route.params.id, 'visible', plan.attributes.visible)" v-model="visible" class="switch" :state="plan.attributes.visible"/>
+				<SwitchInput @input="$updateInput('/subscriptions/admin/plans/' + $route.params.id, 'visible', plan.attributes.visible)" v-model="plan.attributes.visible" class="switch" :state="plan.attributes.visible"/>
 			</AppInputSwitch>
 
 			<!--Name-->
 			<AppInputText :title="$t('admin_page_plans.form.name')">
-				<input @input="$updateInput('/subscriptions/plans/' + $route.params.id, 'name', plan.attributes.name)" v-model="plan.attributes.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" class="focus-border-theme input-dark"/>
+				<input @input="$updateInput('/subscriptions/admin/plans/' + $route.params.id, 'name', plan.attributes.name)" v-model="plan.attributes.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" class="focus-border-theme input-dark"/>
 			</AppInputText>
 
 			<!--Description-->
 			<AppInputText :title="$t('admin_page_plans.form.description')">
-				<textarea @input="$updateInput('/subscriptions/plans/' + $route.params.id, 'description', plan.attributes.description)" v-model="plan.attributes.description" :placeholder="$t('admin_page_plans.form.description_plac')" class="focus-border-theme input-dark"></textarea>
+				<textarea @input="$updateInput('/subscriptions/admin/plans/' + $route.params.id, 'description', plan.attributes.description)" v-model="plan.attributes.description" :placeholder="$t('admin_page_plans.form.description_plac')" class="focus-border-theme input-dark"></textarea>
 			</AppInputText>
 
 			<InfoBox style="margin-bottom: 0">
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
index 301d99de..c4644022 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
@@ -23,7 +23,7 @@
 						</router-link>
 					</td>
 					<td>
-						<ColorLabel :color="getSubscriptionStatusColor(row.data.attributes.status)">
+						<ColorLabel :color="$getSubscriptionStatusColor(row.data.attributes.status)">
 							{{ row.data.attributes.status }}
 						</ColorLabel>
 					</td>
diff --git a/resources/js/views/Admin/Subscriptions.vue b/resources/js/views/Admin/Subscriptions.vue
index 25c28e83..32a609db 100644
--- a/resources/js/views/Admin/Subscriptions.vue
+++ b/resources/js/views/Admin/Subscriptions.vue
@@ -24,7 +24,7 @@
 						</router-link>
 					</td>
 					<td>
-						<ColorLabel :color="getSubscriptionStatusColor(row.data.attributes.status)">
+						<ColorLabel :color="$getSubscriptionStatusColor(row.data.attributes.status)">
 							{{ row.data.attributes.status }}
 						</ColorLabel>
 					</td>
diff --git a/resources/js/views/Admin/Users/User.vue b/resources/js/views/Admin/Users/User.vue
index fbf8491c..f2dc9462 100644
--- a/resources/js/views/Admin/Users/User.vue
+++ b/resources/js/views/Admin/Users/User.vue
@@ -19,7 +19,7 @@
 					</div>
 				</div>
 
-				<CardNavigation :pages="pages" class="-mx-6" />
+				<CardNavigation :pages="pages" class="-mx-3" />
 			</div>
 
 			<!--Router Content-->
diff --git a/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue b/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
index f478ecbe..ab194762 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
@@ -15,7 +15,7 @@
 							</span>
                         </td>
                         <td>
-							<ColorLabel color="purple">
+							<ColorLabel :color="$getTransactionStatusColor(row.data.attributes.status)">
                                 {{ row.data.attributes.status }}
 							</ColorLabel>
                         </td>
diff --git a/resources/js/views/Profile.vue b/resources/js/views/Profile.vue
index dd024171..2d191449 100644
--- a/resources/js/views/Profile.vue
+++ b/resources/js/views/Profile.vue
@@ -5,6 +5,7 @@
 		<Spotlight />
 
 		<ConfirmPopup />
+		<SelectPlanSubscriptionPopup />
 
 		<!--2FA popups-->
 		<TwoFactorRecoveryCodesPopup />
@@ -72,6 +73,7 @@
 </template>
 
 <script>
+	import SelectPlanSubscriptionPopup from "../components/Subscription/SelectPlanSubscriptionPopup";
 	import ConfirmPopup from "../components/Others/Popup/ConfirmPopup";
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
 	import Spotlight from '/resources/js/components/Spotlight/Spotlight'
@@ -88,6 +90,7 @@
 	export default {
         name: 'Settings',
         components: {
+			SelectPlanSubscriptionPopup,
 			ConfirmPopup,
 			CardNavigation,
 			FilePreview,
diff --git a/resources/js/views/User/Invoices.vue b/resources/js/views/User/Invoices.vue
index 810b9e18..8c4c170e 100644
--- a/resources/js/views/User/Invoices.vue
+++ b/resources/js/views/User/Invoices.vue
@@ -15,7 +15,7 @@
 							</span>
                         </td>
                         <td>
-							<ColorLabel color="purple">
+							<ColorLabel :color="$getTransactionStatusColor(row.data.attributes.status)">
                                 {{ row.data.attributes.status }}
 							</ColorLabel>
                         </td>
diff --git a/src/Domain/Admin/Actions/DeleteUserDataAction.php b/src/Domain/Admin/Actions/DeleteUserDataAction.php
index 336b13f1..18631350 100644
--- a/src/Domain/Admin/Actions/DeleteUserDataAction.php
+++ b/src/Domain/Admin/Actions/DeleteUserDataAction.php
@@ -14,12 +14,19 @@ class DeleteUserDataAction
     {
         // Delete user avatar if exists
         if ($user->settings->getRawOriginal('avatar')) {
+
+            // TODO: delete all generated avatars
             Storage::delete($user->settings->getRawOriginal('avatar'));
         }
 
         // Delete all user files
         Storage::deleteDirectory("files/$user->id");
 
+        // Delete user subscriptions
+        if ($user->subscription) {
+            $user->subscription->delete();
+        }
+
         // Delete all user records in database
         collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'traffic'])
             ->each(function ($table) use ($user) {
diff --git a/src/Domain/Admin/Controllers/Users/DeleteUserController.php b/src/Domain/Admin/Controllers/Users/DeleteUserController.php
index 05f918e1..f7df2427 100644
--- a/src/Domain/Admin/Controllers/Users/DeleteUserController.php
+++ b/src/Domain/Admin/Controllers/Users/DeleteUserController.php
@@ -22,10 +22,9 @@ class DeleteUserController extends Controller
             return response('Done.', 204);
         }
 
-        // TODO: secure deletion
-        /*if ($user->subscription) {
-            abort(202, "You can\'t delete this account while user have active subscription.");
-        }*/
+        if ($user->subscription && $user->subscription->active()) {
+            abort(202, "You can\'t delete this account since user has active subscription.");
+        }
 
         if ($user->id === Auth::id()) {
             abort(406, "You can\'t delete your account");