diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 5f0abd69..efb20f0d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,7 +2,7 @@
     "/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=4b4e84e35766f830978f",
+    "/chunks/admin.js": "/chunks/admin.js?id=9495eb53f0cd806df2f3",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=6e28465565ea92af804f",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=b315e8dcb5e79c1c8e7c",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~a2d1c36e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~a2d1c36e.js?id=bbdda6115aa358c2209e",
@@ -15,7 +15,7 @@
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=354c892546e5c369a749",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=7fa6b818b9e646d8766d",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=780f3575fa6ae934027c",
-    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=afeba4ebd13af7e995be",
+    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=e40dcf843c95a51cd397",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=1d5319a48a28f62bb131",
     "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js?id=91eea8e08d675f1a84d2",
     "/chunks/app-email.js": "/chunks/app-email.js?id=3b8d81b3f01fd4d10e0c",
@@ -63,8 +63,8 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=7f623c8a4002f17eecef",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=24e47be06cbf2fedbf05",
     "/chunks/plans.js": "/chunks/plans.js?id=293e7e8d59da542a9710",
-    "/chunks/platform.js": "/chunks/platform.js?id=db5665c8cbab67a67074",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=8e676be3232ce4596d32",
+    "/chunks/platform.js": "/chunks/platform.js?id=281442ca7b715e6db2c3",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=9ba706813930a43d6f66",
     "/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=ca9ca67afd5839597647",
     "/chunks/profile.js": "/chunks/profile.js?id=0ecdd636c92f2f1172d2",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=d9af0efad2af2679954b",
@@ -110,5 +110,174 @@
     "/chunks/settings-storage.e1bdf1e1f40601ed3e1e.hot-update.js": "/chunks/settings-storage.e1bdf1e1f40601ed3e1e.hot-update.js",
     "/chunks/user-storage.e1bdf1e1f40601ed3e1e.hot-update.js": "/chunks/user-storage.e1bdf1e1f40601ed3e1e.hot-update.js",
     "/chunks/platform~chunks/shared.6288bbb92093467f38bc.hot-update.js": "/chunks/platform~chunks/shared.6288bbb92093467f38bc.hot-update.js",
-    "/chunks/platform~chunks/shared.15620c74c73da60fe3ae.hot-update.js": "/chunks/platform~chunks/shared.15620c74c73da60fe3ae.hot-update.js"
+    "/chunks/platform~chunks/shared.15620c74c73da60fe3ae.hot-update.js": "/chunks/platform~chunks/shared.15620c74c73da60fe3ae.hot-update.js",
+    "/chunks/platform.7b77438d5b6f994ccc4a.hot-update.js": "/chunks/platform.7b77438d5b6f994ccc4a.hot-update.js",
+    "/chunks/platform.15ad91a7c07f3ad4270a.hot-update.js": "/chunks/platform.15ad91a7c07f3ad4270a.hot-update.js",
+    "/chunks/platform.e6cf4fb334db42d6f6fa.hot-update.js": "/chunks/platform.e6cf4fb334db42d6f6fa.hot-update.js",
+    "/chunks/platform.f4e30358305b56d046bf.hot-update.js": "/chunks/platform.f4e30358305b56d046bf.hot-update.js",
+    "/chunks/platform.54eacbd4ea074b5dd3c5.hot-update.js": "/chunks/platform.54eacbd4ea074b5dd3c5.hot-update.js",
+    "/chunks/platform.328ffb6f30bc92a27f74.hot-update.js": "/chunks/platform.328ffb6f30bc92a27f74.hot-update.js",
+    "/chunks/platform.c1323f3665a8d6b63ee6.hot-update.js": "/chunks/platform.c1323f3665a8d6b63ee6.hot-update.js",
+    "/chunks/platform.fb625b655fe7aecbc680.hot-update.js": "/chunks/platform.fb625b655fe7aecbc680.hot-update.js",
+    "/chunks/platform.03ff50711e344b2e465f.hot-update.js": "/chunks/platform.03ff50711e344b2e465f.hot-update.js",
+    "/chunks/platform.ac2431920867b1e3e232.hot-update.js": "/chunks/platform.ac2431920867b1e3e232.hot-update.js",
+    "/chunks/platform.223b8436b4a106c62d4b.hot-update.js": "/chunks/platform.223b8436b4a106c62d4b.hot-update.js",
+    "/chunks/platform.ae7701a6d624626cd108.hot-update.js": "/chunks/platform.ae7701a6d624626cd108.hot-update.js",
+    "/chunks/platform.38bfbc680b4f3692d6c1.hot-update.js": "/chunks/platform.38bfbc680b4f3692d6c1.hot-update.js",
+    "/chunks/platform.2d67a2798c420a4816a2.hot-update.js": "/chunks/platform.2d67a2798c420a4816a2.hot-update.js",
+    "/chunks/platform.8240e28ca60298f830b1.hot-update.js": "/chunks/platform.8240e28ca60298f830b1.hot-update.js",
+    "/chunks/platform.d8b9bbd1396fe6ef687b.hot-update.js": "/chunks/platform.d8b9bbd1396fe6ef687b.hot-update.js",
+    "/chunks/platform.98e58b83e66e294cdfe5.hot-update.js": "/chunks/platform.98e58b83e66e294cdfe5.hot-update.js",
+    "/chunks/platform.b266727d71318931e04b.hot-update.js": "/chunks/platform.b266727d71318931e04b.hot-update.js",
+    "/chunks/platform.30c943c0b186f4e4d5ca.hot-update.js": "/chunks/platform.30c943c0b186f4e4d5ca.hot-update.js",
+    "/chunks/platform.dcf9c2774ff146f80379.hot-update.js": "/chunks/platform.dcf9c2774ff146f80379.hot-update.js",
+    "/chunks/platform.b2c0301ff408c76513fb.hot-update.js": "/chunks/platform.b2c0301ff408c76513fb.hot-update.js",
+    "/chunks/platform.a1ae2e72ba9051a01e79.hot-update.js": "/chunks/platform.a1ae2e72ba9051a01e79.hot-update.js",
+    "/chunks/platform.919c39c09aafa98346d5.hot-update.js": "/chunks/platform.919c39c09aafa98346d5.hot-update.js",
+    "/chunks/platform.7bc893b9409f183d3590.hot-update.js": "/chunks/platform.7bc893b9409f183d3590.hot-update.js",
+    "/chunks/platform.8d8a45a18f05bf6d5708.hot-update.js": "/chunks/platform.8d8a45a18f05bf6d5708.hot-update.js",
+    "/chunks/platform.6905b4b2e0ad3e1232bd.hot-update.js": "/chunks/platform.6905b4b2e0ad3e1232bd.hot-update.js",
+    "/chunks/platform.4a397dc52c89f7327003.hot-update.js": "/chunks/platform.4a397dc52c89f7327003.hot-update.js",
+    "/chunks/platform.b907c84fe598fdae4226.hot-update.js": "/chunks/platform.b907c84fe598fdae4226.hot-update.js",
+    "/chunks/platform.1c159c5b6ee2ef294a43.hot-update.js": "/chunks/platform.1c159c5b6ee2ef294a43.hot-update.js",
+    "/chunks/platform.beea09fe4139fbc5df52.hot-update.js": "/chunks/platform.beea09fe4139fbc5df52.hot-update.js",
+    "/chunks/platform.96697b627682f8899b4c.hot-update.js": "/chunks/platform.96697b627682f8899b4c.hot-update.js",
+    "/chunks/platform.cdc025e17edc373cef8d.hot-update.js": "/chunks/platform.cdc025e17edc373cef8d.hot-update.js",
+    "/chunks/platform.0d5ba914991f1c25436a.hot-update.js": "/chunks/platform.0d5ba914991f1c25436a.hot-update.js",
+    "/chunks/platform~chunks/shared.bb8f32a53112cbbbad89.hot-update.js": "/chunks/platform~chunks/shared.bb8f32a53112cbbbad89.hot-update.js",
+    "/chunks/platform.36f551f46f4a6f6bc13e.hot-update.js": "/chunks/platform.36f551f46f4a6f6bc13e.hot-update.js",
+    "/chunks/platform.53a1fcc917641b2724cb.hot-update.js": "/chunks/platform.53a1fcc917641b2724cb.hot-update.js",
+    "/chunks/platform.a9846f0c4c81865f40fe.hot-update.js": "/chunks/platform.a9846f0c4c81865f40fe.hot-update.js",
+    "/chunks/platform.67a2544fdf0e4379ff33.hot-update.js": "/chunks/platform.67a2544fdf0e4379ff33.hot-update.js",
+    "/chunks/platform.173c4e4e3bd112ae5b0b.hot-update.js": "/chunks/platform.173c4e4e3bd112ae5b0b.hot-update.js",
+    "/chunks/platform.740c03d29b54d0c82e9e.hot-update.js": "/chunks/platform.740c03d29b54d0c82e9e.hot-update.js",
+    "/chunks/platform.7c4a2c501c0dad1c60fb.hot-update.js": "/chunks/platform.7c4a2c501c0dad1c60fb.hot-update.js",
+    "/chunks/platform.8e0fb03086ba431f7d52.hot-update.js": "/chunks/platform.8e0fb03086ba431f7d52.hot-update.js",
+    "/chunks/platform.181f6238ff44bff04ce1.hot-update.js": "/chunks/platform.181f6238ff44bff04ce1.hot-update.js",
+    "/chunks/platform.02c54986b4737f0fe640.hot-update.js": "/chunks/platform.02c54986b4737f0fe640.hot-update.js",
+    "/chunks/platform.430b20e44af189497d51.hot-update.js": "/chunks/platform.430b20e44af189497d51.hot-update.js",
+    "/chunks/platform~chunks/shared.e3a28d6da79e9b7ed73f.hot-update.js": "/chunks/platform~chunks/shared.e3a28d6da79e9b7ed73f.hot-update.js",
+    "/chunks/platform.5c5995664016de967acb.hot-update.js": "/chunks/platform.5c5995664016de967acb.hot-update.js",
+    "/chunks/platform.12463ff48dfc8debfedb.hot-update.js": "/chunks/platform.12463ff48dfc8debfedb.hot-update.js",
+    "/chunks/platform.701805f85c63afd0d0d5.hot-update.js": "/chunks/platform.701805f85c63afd0d0d5.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.f0926ddb9ac65d30094b.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.f0926ddb9ac65d30094b.hot-update.js",
+    "/chunks/platform.f0926ddb9ac65d30094b.hot-update.js": "/chunks/platform.f0926ddb9ac65d30094b.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.bca25fb55c5d761cd79c.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.bca25fb55c5d761cd79c.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.fcaefb955b5cd9cb5537.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.fcaefb955b5cd9cb5537.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.efdf6580bbfc77ee07dd.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.efdf6580bbfc77ee07dd.hot-update.js",
+    "/chunks/platform.efdf6580bbfc77ee07dd.hot-update.js": "/chunks/platform.efdf6580bbfc77ee07dd.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.9361efcf5be1a524f8d6.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.9361efcf5be1a524f8d6.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.1fc235127dc1b4ee0f68.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.1fc235127dc1b4ee0f68.hot-update.js",
+    "/chunks/platform.c6a5aa4ee931dd118f89.hot-update.js": "/chunks/platform.c6a5aa4ee931dd118f89.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.9c3a36856d394c94eff6.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.9c3a36856d394c94eff6.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.85602fc4d7afcc596314.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.85602fc4d7afcc596314.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.f84034cdf34b245826a7.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.f84034cdf34b245826a7.hot-update.js",
+    "/chunks/platform.ea1210fbe7f92ea0895a.hot-update.js": "/chunks/platform.ea1210fbe7f92ea0895a.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.0c8bcf055b4e0edb966a.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.0c8bcf055b4e0edb966a.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.d644e4835ac33c05bab9.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.d644e4835ac33c05bab9.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.6c2923732fcd720333ae.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.6c2923732fcd720333ae.hot-update.js",
+    "/chunks/platform.6c2923732fcd720333ae.hot-update.js": "/chunks/platform.6c2923732fcd720333ae.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.30ed1ee77e35a4485fac.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.30ed1ee77e35a4485fac.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.b854e24ffcf85c5df21a.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.b854e24ffcf85c5df21a.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.6ba45a81f4fda8088a20.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.6ba45a81f4fda8088a20.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.bb9ad43af4c5875aa5f3.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.bb9ad43af4c5875aa5f3.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.eb8cf6005d67f8da9993.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.eb8cf6005d67f8da9993.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.abf44999bc01a366e20f.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.abf44999bc01a366e20f.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.4a1e175db50b96318d8f.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.4a1e175db50b96318d8f.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.790d907be0f89add55c2.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.790d907be0f89add55c2.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.6e7b8d4e85af17e061a4.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.6e7b8d4e85af17e061a4.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.2809c7e24472abed598e.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.2809c7e24472abed598e.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.834b7c2074246e6c986d.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.834b7c2074246e6c986d.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.b06fe38b8af5e156574a.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.b06fe38b8af5e156574a.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.0ba5e17649991f903fd7.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.0ba5e17649991f903fd7.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.268f0f2a21140c8a6870.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.268f0f2a21140c8a6870.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.1da51d735e9c79e81cbb.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.1da51d735e9c79e81cbb.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.1946768b0949170d0fa5.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.1946768b0949170d0fa5.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.7753ce1ad15107f6c983.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.7753ce1ad15107f6c983.hot-update.js",
+    "/chunks/platform.e12abfa1e2122625905f.hot-update.js": "/chunks/platform.e12abfa1e2122625905f.hot-update.js",
+    "/chunks/platform.d2dc770a91f071ea85d0.hot-update.js": "/chunks/platform.d2dc770a91f071ea85d0.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.45c240c09c77ad65715f.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.45c240c09c77ad65715f.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.091efb0c4af03ecfbe38.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.091efb0c4af03ecfbe38.hot-update.js",
+    "/chunks/platform~chunks/shared.38c5bac44b694ec66a2c.hot-update.js": "/chunks/platform~chunks/shared.38c5bac44b694ec66a2c.hot-update.js",
+    "/chunks/platform.557bc61a47f187452804.hot-update.js": "/chunks/platform.557bc61a47f187452804.hot-update.js",
+    "/chunks/platform.a79d684255aa1a9ffc52.hot-update.js": "/chunks/platform.a79d684255aa1a9ffc52.hot-update.js",
+    "/chunks/platform.7f41d3b93b7bbdfefd02.hot-update.js": "/chunks/platform.7f41d3b93b7bbdfefd02.hot-update.js",
+    "/chunks/platform.5f616b38e3e7ea019e6e.hot-update.js": "/chunks/platform.5f616b38e3e7ea019e6e.hot-update.js",
+    "/chunks/platform.eccb782d3ec118be52c1.hot-update.js": "/chunks/platform.eccb782d3ec118be52c1.hot-update.js",
+    "/chunks/platform.e843f2cc7e7764661bbe.hot-update.js": "/chunks/platform.e843f2cc7e7764661bbe.hot-update.js",
+    "/chunks/platform.6a8634152545fb5153bb.hot-update.js": "/chunks/platform.6a8634152545fb5153bb.hot-update.js",
+    "/chunks/platform.f9efc1d59c91df405767.hot-update.js": "/chunks/platform.f9efc1d59c91df405767.hot-update.js",
+    "/chunks/platform.4d6342238307f1ae8976.hot-update.js": "/chunks/platform.4d6342238307f1ae8976.hot-update.js",
+    "/chunks/platform.455931824bbe604cd322.hot-update.js": "/chunks/platform.455931824bbe604cd322.hot-update.js",
+    "/chunks/platform.da4aacd61761bfa75b1c.hot-update.js": "/chunks/platform.da4aacd61761bfa75b1c.hot-update.js",
+    "/chunks/platform.06f08e65eaebdf4cb191.hot-update.js": "/chunks/platform.06f08e65eaebdf4cb191.hot-update.js",
+    "/chunks/platform.8c90cb05fd333551718f.hot-update.js": "/chunks/platform.8c90cb05fd333551718f.hot-update.js",
+    "/chunks/platform.33bc88a15bf4df2a982e.hot-update.js": "/chunks/platform.33bc88a15bf4df2a982e.hot-update.js",
+    "/chunks/platform.d1c2bd45fa4d4f4adee6.hot-update.js": "/chunks/platform.d1c2bd45fa4d4f4adee6.hot-update.js",
+    "/chunks/platform.47e039c1302f95072829.hot-update.js": "/chunks/platform.47e039c1302f95072829.hot-update.js",
+    "/chunks/platform.60ee870b32ac2b82020f.hot-update.js": "/chunks/platform.60ee870b32ac2b82020f.hot-update.js",
+    "/chunks/platform.c5184742177db5aa8296.hot-update.js": "/chunks/platform.c5184742177db5aa8296.hot-update.js",
+    "/chunks/platform.bb28b6b86268b77d91c1.hot-update.js": "/chunks/platform.bb28b6b86268b77d91c1.hot-update.js",
+    "/chunks/platform.17dd3abb8e6b599e91e8.hot-update.js": "/chunks/platform.17dd3abb8e6b599e91e8.hot-update.js",
+    "/chunks/platform.f479a6fb1a8141d0515c.hot-update.js": "/chunks/platform.f479a6fb1a8141d0515c.hot-update.js",
+    "/chunks/platform.fe4df8f9eed078bc419d.hot-update.js": "/chunks/platform.fe4df8f9eed078bc419d.hot-update.js",
+    "/chunks/platform.71a5f503f2714139c4d2.hot-update.js": "/chunks/platform.71a5f503f2714139c4d2.hot-update.js",
+    "/chunks/platform.64e5a2dae83130f2596e.hot-update.js": "/chunks/platform.64e5a2dae83130f2596e.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.b40e81989e3d2419171c.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.b40e81989e3d2419171c.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.4edcb6d043013b202a98.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.4edcb6d043013b202a98.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.3cb73242940d39ed4911.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.3cb73242940d39ed4911.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/shared.c2b9be02f6c04c2fd80d.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.c2b9be02f6c04c2fd80d.hot-update.js",
+    "/chunks/platform.282ce2a61c1ebb639d4d.hot-update.js": "/chunks/platform.282ce2a61c1ebb639d4d.hot-update.js",
+    "/chunks/platform.9119ef8443a7db11f9f3.hot-update.js": "/chunks/platform.9119ef8443a7db11f9f3.hot-update.js",
+    "/chunks/platform.7f35bbefa7e192fd407c.hot-update.js": "/chunks/platform.7f35bbefa7e192fd407c.hot-update.js",
+    "/chunks/platform.0b144e95c818bf57bb21.hot-update.js": "/chunks/platform.0b144e95c818bf57bb21.hot-update.js",
+    "/chunks/platform.ef3092d6455004cad33e.hot-update.js": "/chunks/platform.ef3092d6455004cad33e.hot-update.js",
+    "/chunks/platform.78b7fb11c7d46e143959.hot-update.js": "/chunks/platform.78b7fb11c7d46e143959.hot-update.js",
+    "/chunks/platform.70a9f5c2076acc19db09.hot-update.js": "/chunks/platform.70a9f5c2076acc19db09.hot-update.js",
+    "/chunks/platform.6bbe1cf28e1075612cc0.hot-update.js": "/chunks/platform.6bbe1cf28e1075612cc0.hot-update.js",
+    "/chunks/platform.02000eb49bc1fb6182ef.hot-update.js": "/chunks/platform.02000eb49bc1fb6182ef.hot-update.js",
+    "/chunks/platform.25d74624160fb729519b.hot-update.js": "/chunks/platform.25d74624160fb729519b.hot-update.js",
+    "/chunks/platform.c58ac5f05bf315d0c063.hot-update.js": "/chunks/platform.c58ac5f05bf315d0c063.hot-update.js",
+    "/chunks/platform.4eec928d403b831c3f5d.hot-update.js": "/chunks/platform.4eec928d403b831c3f5d.hot-update.js",
+    "/chunks/platform.b14b2581d9d587cf61c0.hot-update.js": "/chunks/platform.b14b2581d9d587cf61c0.hot-update.js",
+    "/chunks/platform.94c5203d5246830dbeb6.hot-update.js": "/chunks/platform.94c5203d5246830dbeb6.hot-update.js",
+    "/chunks/admin.45ad82d2e57188d409ff.hot-update.js": "/chunks/admin.45ad82d2e57188d409ff.hot-update.js",
+    "/chunks/admin.c1e39b04e0eb570b9588.hot-update.js": "/chunks/admin.c1e39b04e0eb570b9588.hot-update.js",
+    "/chunks/admin.1c33e4aaab2c1bdda2c3.hot-update.js": "/chunks/admin.1c33e4aaab2c1bdda2c3.hot-update.js",
+    "/chunks/admin.0f76ac9a1e9878b9e928.hot-update.js": "/chunks/admin.0f76ac9a1e9878b9e928.hot-update.js",
+    "/js/main.0cfeba17e85dfe64d0ec.hot-update.js": "/js/main.0cfeba17e85dfe64d0ec.hot-update.js",
+    "/chunks/admin.0cfeba17e85dfe64d0ec.hot-update.js": "/chunks/admin.0cfeba17e85dfe64d0ec.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9d002349.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9d002349.js?id=403c60cb1539099a2606",
+    "/chunks/app-language~chunks/files~chunks/my-shared-items~chunks/pages~chunks/plans~chunks/platform~ch~9aa1abde.js": "/chunks/app-language~chunks/files~chunks/my-shared-items~chunks/pages~chunks/plans~chunks/platform~ch~9aa1abde.js?id=388a67e2eea06f7c8a82",
+    "/chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/s~5e91618f.js": "/chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/s~5e91618f.js?id=b84b1b318b88901f553b",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~chunks/sha~17062269.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~chunks/sha~17062269.js?id=bfec34506ab5bad5c445",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~chunks/sha~3c0f2ee0.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~chunks/sha~3c0f2ee0.js?id=b94bf48e9e5c1094b319",
+    "/chunks/platform.0cfeba17e85dfe64d0ec.hot-update.js": "/chunks/platform.0cfeba17e85dfe64d0ec.hot-update.js",
+    "/chunks/platform~chunks/settings.js": "/chunks/platform~chunks/settings.js?id=85453ce2907b5ea0a954",
+    "/chunks/platform~chunks/settings~chunks/shared.js": "/chunks/platform~chunks/settings~chunks/shared.js?id=cfd74977d4cb069dc164",
+    "/chunks/platform~chunks/shared.0cfeba17e85dfe64d0ec.hot-update.js": "/chunks/platform~chunks/shared.0cfeba17e85dfe64d0ec.hot-update.js",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-lang~abc58ca7.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-lang~abc58ca7.js?id=3b13e3317741e63c5b2f",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-othe~a58c4880.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-othe~a58c4880.js?id=8cb9388deedb1f893c77",
+    "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~ch~13080601.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settings~ch~13080601.js?id=05e0a3877414428d6c22",
+    "/vendors~chunks/platform~chunks/settings~chunks/shared.js": "/vendors~chunks/platform~chunks/settings~chunks/shared.js?id=cbd9e95f24670db405b3",
+    "/js/main.2513f34d5f7b9b5ca4b3.hot-update.js": "/js/main.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/admin.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/admin.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/platform.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/platform.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/platform~chunks/shared.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/platform~chunks/shared.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/settings.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/settings.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/settings-password.2513f34d5f7b9b5ca4b3.hot-update.js": "/chunks/settings-password.2513f34d5f7b9b5ca4b3.hot-update.js",
+    "/chunks/admin.d2a068da73139575a09b.hot-update.js": "/chunks/admin.d2a068da73139575a09b.hot-update.js",
+    "/chunks/admin.d6ce25f0439a36fd13ca.hot-update.js": "/chunks/admin.d6ce25f0439a36fd13ca.hot-update.js",
+    "/chunks/admin.c9be66113fe0c9ace43f.hot-update.js": "/chunks/admin.c9be66113fe0c9ace43f.hot-update.js",
+    "/chunks/admin.74b8949807ba707201ca.hot-update.js": "/chunks/admin.74b8949807ba707201ca.hot-update.js",
+    "/chunks/admin.45b8ab0ad5aa1cedd587.hot-update.js": "/chunks/admin.45b8ab0ad5aa1cedd587.hot-update.js",
+    "/chunks/admin.fdbfd3a67d3083009c49.hot-update.js": "/chunks/admin.fdbfd3a67d3083009c49.hot-update.js",
+    "/chunks/admin.19068095206321febdd1.hot-update.js": "/chunks/admin.19068095206321febdd1.hot-update.js",
+    "/chunks/admin.9cacf7e90b6a027d0a9a.hot-update.js": "/chunks/admin.9cacf7e90b6a027d0a9a.hot-update.js",
+    "/chunks/admin.0c4b5321a4d21a31c47a.hot-update.js": "/chunks/admin.0c4b5321a4d21a31c47a.hot-update.js",
+    "/chunks/platform~chunks/shared.34c379a70e319d229641.hot-update.js": "/chunks/platform~chunks/shared.34c379a70e319d229641.hot-update.js",
+    "/chunks/platform~chunks/shared.66f7d160489c94efc5eb.hot-update.js": "/chunks/platform~chunks/shared.66f7d160489c94efc5eb.hot-update.js",
+    "/chunks/platform~chunks/shared.80bdcd9c82a8fb8b4b1a.hot-update.js": "/chunks/platform~chunks/shared.80bdcd9c82a8fb8b4b1a.hot-update.js",
+    "/chunks/platform~chunks/shared.802df6dd61b3adc2ebc1.hot-update.js": "/chunks/platform~chunks/shared.802df6dd61b3adc2ebc1.hot-update.js"
 }
diff --git a/resources/js/components/Others/TreeMenuNavigator.vue b/resources/js/components/Others/TreeMenuNavigator.vue
index 1a51aefb..aae2ddfb 100644
--- a/resources/js/components/Others/TreeMenuNavigator.vue
+++ b/resources/js/components/Others/TreeMenuNavigator.vue
@@ -2,7 +2,7 @@
 	<div>
 		<div
 			@click="goToFolder"
-			class="flex items-center py-2 rounded-lg border-2 border-transparent border-dashed cursor-pointer"
+			class="flex items-center py-2.5 rounded-lg border-2 border-transparent border-dashed cursor-pointer"
 			:class="{'border-theme': area, 'pointer-events-none opacity-50': disabledFolder || disabled && draggedItem.length > 0  }"
 			:style="indent"
 			@dragover.prevent="dragEnter"
@@ -18,7 +18,7 @@
 			</div>
 			<folder-icon size="17" class="mr-2.5 vue-feather" :class="{'text-theme': isSelected}" />
 			<b
-				class="font-bold text-sm max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap"
+				class="font-bold text-xs max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap"
 				:class="{'text-theme': isSelected}"
 			>
 				{{ nodes.name }}
@@ -82,9 +82,7 @@
 
 				let offset = window.innerWidth <= 1024 ? 14 : 18;
 
-				let value = this.depth === 0 ? offset : offset + (this.depth * 18);
-
-				return {paddingLeft: value + 'px'}
+				return {paddingLeft: this.depth === 0 ? 0 : offset * this.depth + 'px'}
 			},
 		},
 		data() {
diff --git a/resources/js/components/Sidebar/ContentGroup.vue b/resources/js/components/Sidebar/ContentGroup.vue
index 9535e780..096a82a9 100644
--- a/resources/js/components/Sidebar/ContentGroup.vue
+++ b/resources/js/components/Sidebar/ContentGroup.vue
@@ -1,16 +1,13 @@
 <template>
-    <div class="content-group" :class="{'is-collapsed': ! isVisible, 'collapsable': canCollapse}">
-
-        <div class="group-title" @click="hideGroup">
-            <TextLabel class="title">{{ title }}</TextLabel>
-            <chevron-up-icon v-if="canCollapseWrapper" size="12" class="icon" />
+    <div class="ml-6 mb-6" :class="{'is-collapsed': ! isVisible, 'collapsable': canCollapse}">
+        <div @click="hideGroup" class="flex items-center justify-between mb-2">
+            <small class="text-xs font-bold dark:text-gray-700 text-gray-400">
+				{{ title }}
+			</small>
+            <chevron-up-icon v-if="canCollapseWrapper" size="12" class="mr-5 cursor-pointer vue-feather text-gray-300 transform" :class="{'rotate-180': ! isVisible}" />
         </div>
 
-        <transition name="list">
-            <div class="wrapper" v-show="isVisible">
-                <slot></slot>
-            </div>
-        </transition>
+		<slot v-if="isVisible" />
     </div>
 </template>
 
@@ -20,7 +17,11 @@
 
     export default {
         name: 'ContentGroup',
-        props: ['title', 'canCollapse', 'slug'],
+        props: [
+			'canCollapse',
+			'title',
+			'slug'
+		],
         components: {
             ChevronUpIcon,
             TextLabel,
@@ -52,58 +53,3 @@
         }
     }
 </script>
-
-<style scoped lang="scss">
-    @import '/resources/sass/vuefilemanager/_mixins';
-
-    .content-group {
-        margin-bottom: 15px;
-        transition: all 300ms;
-
-        .group-title {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 5px;
-
-            .title {
-                margin-bottom: 0;
-            }
-
-            .icon {
-                margin-right: 19px;
-                opacity: 0.25;
-                @include transition;
-            }
-        }
-
-        &.collapsable {
-            .group-title {
-                cursor: pointer;
-            }
-        }
-
-        &.is-collapsed {
-            margin-bottom: 15px;
-
-            .icon {
-                @include transform(rotate(180deg));
-            }
-
-        }
-    }
-
-    .list-enter,
-    .list-leave-to {
-        visibility: hidden;
-        height: 0;
-        margin: 0;
-        padding: 0;
-        opacity: 0;
-    }
-
-    .list-enter-active,
-    .list-leave-active {
-        transition: all 300ms;
-    }
-</style>
diff --git a/resources/js/views/Admin.vue b/resources/js/views/Admin.vue
index 4923ecb3..0d7c1d0a 100644
--- a/resources/js/views/Admin.vue
+++ b/resources/js/views/Admin.vue
@@ -17,53 +17,22 @@
         <SidebarNavigation/>
 
         <ContentSidebar>
+			<ContentGroup v-for="(menu, i) in nav" :title="menu.groupTitle" :slug="menu.groupTitle" :can-collapse="false">
+				<router-link v-for="(item, i) in menu.groupLinks" :key="i" :to="{name: item.route}" class="flex items-center py-2.5" :class="{'router-link-active': item.linkActivation && item.linkActivation.includes($router.currentRoute.fullPath.split('/')[2])}">
+					<box-icon v-if="item.icon === 'box'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<users-icon v-if="item.icon === 'users'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<settings-icon v-if="item.icon === 'settings'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<monitor-icon v-if="item.icon === 'monitor'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<globe-icon v-if="item.icon === 'globe'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<credit-card-icon v-if="item.icon === 'card'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<database-icon v-if="item.icon === 'database'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<dollar-sign-icon v-if="item.icon === 'dollar'" size="17" class="mr-2.5 vue-feather icon-active" />
+					<file-text-icon v-if="item.icon === 'file-text'" size="17" class="mr-2.5 vue-feather icon-active" />
 
-            <!--Admin-->
-			<ContentGroup :title="$t('global.admin')" class="navigator">
-                <div class="menu-list-wrapper vertical">
-					<router-link v-for="(menu, i) in admin" :key="i" :to="{name: menu.route}" class="menu-list-item link" :class="{'router-link-active': menu.linkActivation && menu.linkActivation.includes($router.currentRoute.fullPath.split('/')[2])}">
-                        <div class="icon text-theme">
-                            <box-icon v-if="menu.icon === 'box'" size="17" />
-                            <users-icon v-if="menu.icon === 'users'" size="17" />
-                            <settings-icon v-if="menu.icon === 'settings'" size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            {{ menu.title }}
-                        </div>
-                    </router-link>
-                </div>
-            </ContentGroup>
-
-            <!--Content-->
-            <ContentGroup :title="$t('Content')" class="navigator">
-                <div class="menu-list-wrapper vertical">
-					<router-link v-for="(menu, i) in content" :key="i" :to="{name: menu.route}" class="menu-list-item link">
-                        <div class="icon text-theme">
-							<monitor-icon v-if="menu.icon === 'monitor'" size="17" />
-                            <globe-icon v-if="menu.icon === 'globe'" size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            {{ menu.title }}
-                        </div>
-                    </router-link>
-                </div>
-            </ContentGroup>
-
-            <!-- Assets -->
-            <ContentGroup :title="$t('Subscription')" v-if="config.isSaaS" class="navigator">
-                <div class="menu-list-wrapper vertical">
-					<router-link v-for="(menu, i) in assetMenu" :key="i" :to="{name: menu.route}" class="menu-list-item link" :class="{'router-link-active': menu.linkActivation && menu.linkActivation.includes($router.currentRoute.fullPath.split('/')[2])}">
-                        <div class="icon text-theme">
-                            <credit-card-icon v-if="menu.icon === 'card'" size="17" />
-                            <database-icon v-if="menu.icon === 'database'" size="17" />
-                            <dollar-sign-icon v-if="menu.icon === 'dollar'" size="17" />
-                            <file-text-icon v-if="menu.icon === 'file-text'" size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            {{ menu.title }}
-                        </div>
-                    </router-link>
-                </div>
+					<b class="font-bold text-xs text-active">
+						{{ item.title }}
+					</b>
+				</router-link>
             </ContentGroup>
         </ContentSidebar>
 
@@ -90,8 +59,8 @@
 				'isVisibleNavigationBars',
 				'config',
 			]),
-			assetMenu() {
-				return {
+			nav() {
+				let subscriptionLinks = {
 					metered: [
 						{
 							title: this.$t('Payments'),
@@ -138,44 +107,56 @@
 						},
 					],
 				}[this.config.subscriptionType]
-			}
-        },
-		data() {
-			return {
-				admin: [
+
+				return [
 					{
-						title: this.$t('admin_menu.dashboard'),
-						route: 'Dashboard',
-						icon: 'box',
-					},
-					{
-						title: this.$t('admin_menu.users'),
-						route: 'Users',
-						icon: 'users',
-						linkActivation: [
-							'users', 'user'
+						groupCollapsable: false,
+						groupTitle: this.$t('global.admin'),
+						groupLinks: [
+							{
+								title: this.$t('admin_menu.dashboard'),
+								route: 'Dashboard',
+								icon: 'box',
+							},
+							{
+								title: this.$t('admin_menu.users'),
+								route: 'Users',
+								icon: 'users',
+								linkActivation: [
+									'users', 'user'
+								],
+							},
+							{
+								title: this.$t('admin_menu.settings'),
+								route: 'AppSettings',
+								icon: 'settings',
+							},
 						],
 					},
 					{
-						title: this.$t('admin_menu.settings'),
-						route: 'AppSettings',
-						icon: 'settings',
-					},
-				],
-				content: [
-					{
-						title: this.$t('admin_menu.pages'),
-						route: 'Pages',
-						icon: 'monitor',
+						groupCollapsable: false,
+						groupTitle: this.$t('Content'),
+						groupLinks: [
+							{
+								title: this.$t('admin_menu.pages'),
+								route: 'Pages',
+								icon: 'monitor',
+							},
+							{
+								title: this.$t('admin_menu.languages'),
+								route: 'Language',
+								icon: 'globe',
+							},
+						],
 					},
 					{
-						title: this.$t('admin_menu.languages'),
-						route: 'Language',
-						icon: 'globe',
+						groupCollapsable: false,
+						groupTitle: this.$t('Subscription'),
+						groupLinks: subscriptionLinks,
 					},
-				],
+				]
 			}
-		},
+        },
         components: {
 			FilePreview,
 			Spotlight,
diff --git a/resources/js/views/FileView/Components/PanelNavigationFiles.vue b/resources/js/views/FileView/Components/PanelNavigationFiles.vue
index e68a8bab..2f41533c 100644
--- a/resources/js/views/FileView/Components/PanelNavigationFiles.vue
+++ b/resources/js/views/FileView/Components/PanelNavigationFiles.vue
@@ -1,94 +1,55 @@
 <template>
-	<ContentSidebar class="relative" v-if="isVisibleNavigationBars">
+	<ContentSidebar v-if="isVisibleNavigationBars" class="relative">
+
+		<!--Full screen button-->
 		<div @click="toggleNavigationBars" class="inline-block absolute top-2.5 right-0 p-3 cursor-pointer transition-all duration-200 hover:opacity-70 opacity-0">
 			<chevrons-left-icon size="18"/>
 		</div>
 
 		<!--Locations-->
-		<ContentGroup :title="$t('sidebar.locations_title')">
-			<div class="menu-list-wrapper vertical">
-				<router-link @click.native="resetData" :to="{name: 'Files'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<home-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('sidebar.home') }}
-					</div>
-				</router-link>
-				<router-link @click.native="resetData" :to="{name: 'RecentUploads'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<upload-cloud-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('sidebar.latest') }}
-					</div>
-				</router-link>
-				<router-link @click.native="resetData" :to="{name: 'MySharedItems'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<link-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('sidebar.my_shared') }}
-					</div>
-				</router-link>
-				<router-link @click.native="resetData" :to="{name: 'Trash'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<trash2-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('locations.trash') }}
-					</div>
-				</router-link>
-			</div>
-		</ContentGroup>
+		<ContentGroup v-for="(menu, i) in nav" :title="menu.groupTitle" :slug="menu.groupTitle" :can-collapse="menu.groupCollapsable">
+			<router-link v-for="(item, i) in menu.groupLinks" :key="i" @click.native="resetData" :to="{name: item.route}" class="flex items-center py-2.5">
+				<home-icon v-if="item.icon === 'home'" size="17" class="mr-2.5 vue-feather icon-active"/>
+				<upload-cloud-icon v-if="item.icon === 'upload-cloud'" size="17" class="mr-2.5 vue-feather icon-active" />
+				<link-icon v-if="item.icon === 'link'" size="17" class="mr-2.5 vue-feather icon-active" />
+				<trash2-icon v-if="item.icon === 'trash'" size="17" class="mr-2.5 vue-feather icon-active" />
+				<users-icon size="17" v-if="item.icon === 'users'" class="mr-2.5 vue-feather icon-active" />
+				<user-check-icon size="17" v-if="item.icon === 'user-check'" class="mr-2.5 vue-feather icon-active" />
 
-		<!--Locations-->
-		<ContentGroup :title="$t('Collaboration')" slug="collaboration" :can-collapse="true">
-			<div class="menu-list-wrapper vertical">
-				<router-link @click.native="resetData" :to="{name: 'TeamFolders'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<users-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('Team Folders') }}
-					</div>
-				</router-link>
-				<router-link @click.native="resetData" :to="{name: 'SharedWithMe'}" class="menu-list-item link">
-					<div class="icon text-theme">
-						<user-check-icon size="17" />
-					</div>
-					<div class="label text-theme">
-						{{ $t('Shared with Me') }}
-					</div>
-				</router-link>
-			</div>
+				<b class="font-bold text-xs text-active">
+					{{ item.title }}
+				</b>
+			</router-link>
 		</ContentGroup>
 
 		<!--Navigator-->
-		<ContentGroup v-if="user" :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true" class="navigator">
-			<span v-if="tree.length === 0" class="empty-note navigator">
-				{{ $t('sidebar.folders_empty') }}
-			</span>
-			<TreeMenuNavigator v-if="navigation" class="folder-tree" :depth="0" :nodes="folder" v-for="folder in tree" :key="folder.id"/>
+		<ContentGroup v-if="navigation" :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true">
+			<small v-if="tree.length === 0" class="text-xs font-bold text-gray-500">
+				{{ $t("There isn't any folder.") }}
+			</small>
+			<TreeMenuNavigator :depth="0" :nodes="folder" v-for="folder in tree" :key="folder.id"/>
 		</ContentGroup>
 
 		<!--Favourites-->
 		<ContentGroup v-if="user" :title="$t('sidebar.favourites')" slug="favourites" :can-collapse="true">
 
-			<div @dragover.prevent="dragEnter" @dragleave="dragLeave" @drop="dragFinish($event)" :class="{ 'is-dragenter': area }" class="menu-list-wrapper vertical favourites">
-				<transition-group tag="div" class="menu-list" name="folder">
-					<span v-if="favourites.length === 0" class="empty-note favourites" :key="0">
-						{{ $t('sidebar.favourites_empty') }}
-					</span>
+			<div @dragover.prevent="dragEnter" @dragleave="dragLeave" @drop="dragFinish($event)" :class="{'border-theme': area }" class="border-2 border-transparent border-dashed">
 
-					<div @click="goToFolder(folder)" v-for="folder in favourites" :key="folder.data.id" class="menu-list-item folder-item">
-						<div class="text-theme flex">
-							<folder-icon size="17" class="folder-icon" />
-							<span class="label text-theme">{{ folder.data.attributes.name }}</span>
-						</div>
-						<x-icon @click.stop="$removeFavourite(folder)" size="17" class="delete-icon" />
+				<!--Empty message-->
+				<small v-if="favourites.length === 0" class="text-xs font-bold text-gray-500 favourites" :key="0">
+					{{ $t('sidebar.favourites_empty') }}
+				</small>
+
+				<!--Folder item-->
+				<div @click="goToFolder(folder)" v-for="folder in favourites" :key="folder.data.id" class="group flex items-center justify-between py-2.5 cursor-pointer">
+					<div class="flex items-center">
+						<folder-icon size="17" class="mr-2.5 vue-feather" :class="{'text-theme': $route.params.id === folder.data.id}" />
+						<span class="font-bold text-xs max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap" :class="{'text-theme': $route.params.id === folder.data.id}">
+							{{ folder.data.attributes.name }}
+						</span>
 					</div>
-				</transition-group>
+					<x-icon @click.stop="$removeFavourite(folder)" size="12" class="mr-5 group-hover:opacity-100 opacity-0" />
+				</div>
 			</div>
 		</ContentGroup>
 	</ContentSidebar>
@@ -148,6 +109,50 @@ export default {
 		return {
 			draggedItem: undefined,
 			area: false,
+			nav: [
+				{
+					groupCollapsable: false,
+					groupTitle: this.$t('sidebar.locations_title'),
+					groupLinks: [
+						{
+							icon: 'home',
+							route: 'Files',
+							title: this.$t('sidebar.home'),
+						},
+						{
+							icon: 'upload-cloud',
+							route: 'RecentUploads',
+							title: this.$t('sidebar.latest'),
+						},
+						{
+							icon: 'link',
+							route: 'MySharedItems',
+							title: this.$t('sidebar.my_shared'),
+						},
+						{
+							icon: 'trash',
+							route: 'Trash',
+							title: this.$t('locations.trash'),
+						},
+					],
+				},
+				{
+					groupCollapsable: true,
+					groupTitle: this.$t('Collaboration'),
+					groupLinks: [
+						{
+							icon: 'users',
+							route: 'TeamFolders',
+							title: this.$t('Team Folders'),
+						},
+						{
+							icon: 'user-check',
+							route: 'SharedWithMe',
+							title: this.$t('Shared with Me'),
+						},
+					],
+				},
+			],
 		}
 	},
 	methods: {
@@ -203,50 +208,4 @@ export default {
 		this.$store.dispatch('getFolderTree')
 	}
 }
-</script>
-
-<style lang="scss" scoped>
-
-	.empty-note {
-
-		&.navigator {
-			padding: 5px 25px 10px;
-		}
-
-		&.favourites {
-			padding: 5px 23px 10px;
-		}
-	}
-
-	.navigator {
-		width: 100%;
-		overflow-x: auto;
-	}
-
-	@media only screen and (max-width: 1024px) {
-
-		.empty-note {
-
-			&.navigator {
-				padding: 5px 20px 10px;
-			}
-
-			&.favourites {
-				padding: 5px 18px 10px;
-			}
-		}
-	}
-
-	.folder-item {
-		transition: all 300ms;
-		display: inline-block;
-		margin-right: 10px;
-	}
-	.folder-enter, .folder-leave-to {
-		opacity: 0;
-		transform: translateY(-20px);
-	}
-	.folder-leave-active {
-		position: absolute;
-	}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/resources/views/vuefilemanager/others/color-template.blade.php b/resources/views/vuefilemanager/others/color-template.blade.php
index 27f757dc..6439e252 100644
--- a/resources/views/vuefilemanager/others/color-template.blade.php
+++ b/resources/views/vuefilemanager/others/color-template.blade.php
@@ -4,6 +4,15 @@
             $color = $settings->app_color ?? '#00BC7E';
         @endphp
 
+        {{-- Tailwind Helpers --}}
+        .router-link-active .icon-active {
+            color: {{ $color }};
+        }
+        .router-link-active .text-active {
+            color: {{ $color }};
+        }
+
+
         {{-- Group options --}}
         .group:hover:not(.hover-disabled) .group-hover-text-theme {color: {{ $color }} !important;}