diff --git a/libs/components/Dashboard/Settings/Forms/AppForm.vue b/libs/components/Dashboard/Settings/Forms/AppForm.vue
index d9df8b08fe..2e7008bc64 100644
--- a/libs/components/Dashboard/Settings/Forms/AppForm.vue
+++ b/libs/components/Dashboard/Settings/Forms/AppForm.vue
@@ -40,8 +40,6 @@
             </div>
           </div>
 
-
-
           <div class="sm:col-span-3">
             <label for="env" class="block text-sm font-medium leading-6 text-gray-900">Redirect Urls</label>
             <div class="mt-2">
@@ -129,7 +127,6 @@
               <input id="cipher" type="text" name="cipher" placeholder="AES-256-CBC" value="aes-256-cbc" class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6">
             </div>
           </div>
-
         </div>
       </div>
     </div>
diff --git a/libs/components/Dashboard/Settings/Forms/CacheForm.vue b/libs/components/Dashboard/Settings/Forms/CacheForm.vue
index 717ac68673..108ec780e8 100644
--- a/libs/components/Dashboard/Settings/Forms/CacheForm.vue
+++ b/libs/components/Dashboard/Settings/Forms/CacheForm.vue
@@ -3,259 +3,272 @@
 </script>
 
 <template>
-  <main>
-    <!-- Settings forms -->
-    <div class="divide-y divide-white/5">
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            DynamoDB
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your dynamoDB settings.
-          </p>
-        </div>
+  <form>
+    <main class="border-b border-gray-900/10">
+      <!-- Settings forms -->
+      <div class="divide-y divide-gray-900/10">
+        <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
+          <div>
+            <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
+              DynamoDB
+            </h2>
+            <p class="mt-1 text-sm leading-6 text-gray-600">
+              Update your dynamoDB settings.
+            </p>
+          </div>
 
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-host"
-                  type="text"
-                  name="name"
-                  value="stacks.s3.amazonaws.com"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+          <div class="md:col-span-2">
+            <div class="w-full grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+              <div class="sm:col-span-3">
+                <label
+                  for="dynamo-host"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Host</label>
+                <div class="mt-2">
+                  <input
+                    id="dynamo-host"
+                    type="text"
+                    name="name"
+                    value="stacks.s3.amazonaws.com"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-key"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Key</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-key"
-                  type="text"
-                  name="name"
-                  value="kldsanko3njksdasjfasdn2m"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="sm:col-span-3">
+                <label
+                  for="dynamo-key"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Key</label>
+                <div class="mt-2">
+                  <input
+                    id="dynamo-key"
+                    type="text"
+                    name="name"
+                    value="kldsanko3njksdasjfasdn2m"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-secret"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Secret</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-secret"
-                  type="text"
-                  name="last-name"
-                  autocomplete="family-name"
-                  value="kldsanko3njksdasjfasdn2m"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="sm:col-span-3">
+                <label
+                  for="dynamo-secret"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Secret</label>
+                <div class="mt-2">
+                  <input
+                    id="dynamo-secret"
+                    type="text"
+                    name="last-name"
+                    autocomplete="family-name"
+                    value="kldsanko3njksdasjfasdn2m"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-region"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Region</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-region"
-                  type="text"
-                  name="last-name"
-                  value="us-east-1"
-                  autocomplete="family-name"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="sm:col-span-3">
+                <label
+                  for="dynamo-region"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Region</label>
+                <div class="mt-2">
+                  <input
+                    id="dynamo-region"
+                    type="text"
+                    name="last-name"
+                    value="us-east-1"
+                    autocomplete="family-name"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-table"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Table</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-table"
-                  type="text"
-                  name="last-name"
-                  autocomplete="family-name"
-                  value="cache"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="sm:col-span-3">
+                <label
+                  for="dynamo-table"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Table</label>
+                <div class="mt-2">
+                  <input
+                    id="dynamo-table"
+                    type="text"
+                    name="last-name"
+                    autocomplete="family-name"
+                    value="cache"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
             </div>
           </div>
-        </form>
-      </div>
-
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            Memcached
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your memcached settings.
-          </p>
         </div>
 
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="col-span-full">
-              <label
-                for="memcached-persistent-id"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Persistent ID</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-persistent-id"
-                  type="text"
-                  value="hj3jknkjh1kjh5"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+        <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
+          <div>
+            <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
+              Memcached
+            </h2>
+            <p class="mt-1 text-sm leading-6 text-gray-600">
+              Update your memcached settings.
+            </p>
+          </div>
+
+          <div class="md:col-span-2">
+            <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+              <div class="col-span-full">
+                <label
+                  for="memcached-persistent-id"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Persistent ID</label>
+                <div class="mt-2">
+                  <input
+                    id="memcached-persistent-id"
+                    type="text"
+                    value="hj3jknkjh1kjh5"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-3">
-              <label
-                for="memcached-username"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Username</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-username"
-                  name="new_password"
-                  type="text"
-                  value="username"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-3">
+                <label
+                  for="memcached-username"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Username</label>
+                <div class="mt-2">
+                  <input
+                    id="memcached-username"
+                    name="new_password"
+                    type="text"
+                    value="username"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-3">
-              <label
-                for="memcached-password"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Password</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-password"
-                  type="password"
-                  value="test@123"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-3">
+                <label
+                  for="memcached-password"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Password</label>
+                <div class="mt-2">
+                  <input
+                    id="memcached-password"
+                    type="password"
+                    value="test@123"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-3">
-              <label
-                for="memcached-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-host"
-                  type="text"
-                  value="stacks.s3.amazonaws.com"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-3">
+                <label
+                  for="memcached-host"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Host</label>
+                <div class="mt-2">
+                  <input
+                    id="memcached-host"
+                    type="text"
+                    value="stacks.s3.amazonaws.com"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-3">
-              <label
-                for="memcached-port"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Port</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-port"
-                  type="text"
-                  value="11211"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-3">
+                <label
+                  for="memcached-port"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Port</label>
+                <div class="mt-2">
+                  <input
+                    id="memcached-port"
+                    type="text"
+                    value="11211"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
             </div>
           </div>
-        </form>
-      </div>
-
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            Redis
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your redis settings.
-          </p>
         </div>
 
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="col-span-3">
-              <label
-                for="redis-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="redis-host"
-                  name="new_password"
-                  type="text"
-                  value="127.0.0.1"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+        <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
+          <div>
+            <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
+              Redis
+            </h2>
+            <p class="mt-1 text-sm leading-6 text-gray-600">
+              Update your redis settings.
+            </p>
+          </div>
+
+          <div class="md:col-span-2">
+            <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+              <div class="col-span-3">
+                <label
+                  for="redis-host"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Host</label>
+                <div class="mt-2">
+                  <input
+                    id="redis-host"
+                    name="new_password"
+                    type="text"
+                    value="127.0.0.1"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-3">
-              <label
-                for="redis-port"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Port</label>
-              <div class="mt-2">
-                <input
-                  id="redis-port"
-                  type="text"
-                  value="6379"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-3">
+                <label
+                  for="redis-port"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Port</label>
+                <div class="mt-2">
+                  <input
+                    id="redis-port"
+                    type="text"
+                    value="6379"
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
-            </div>
 
-            <div class="col-span-full">
-              <label
-                for="redis-password"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Password</label>
-              <div class="mt-2">
-                <input
-                  id="redis-password"
-                  type="password"
-                  value=""
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
+              <div class="col-span-full">
+                <label
+                  for="redis-password"
+                  class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
+                >Password</label>
+                <div class="mt-2">
+                  <input
+                    id="redis-password"
+                    type="password"
+                    value=""
+                    class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
+                  >
+                </div>
               </div>
             </div>
           </div>
-        </form>
+        </div>
       </div>
+    </main>
+    <div class="mt-6 flex items-center justify-end gap-x-6">
+      <button type="button" class="text-sm font-semibold leading-6 text-gray-900">
+        Cancel
+      </button>
+      <Button
+        type="submit"
+        class="rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
+      >
+        Save
+      </Button>
     </div>
-  </main>
+  </form>
 </template>
 
 <style scoped>
diff --git a/libs/components/Dashboard/Settings/SettingsFormManager.vue b/libs/components/Dashboard/Settings/SettingsFormManager.vue
index 7344e6bc35..be09d3034a 100644
--- a/libs/components/Dashboard/Settings/SettingsFormManager.vue
+++ b/libs/components/Dashboard/Settings/SettingsFormManager.vue
@@ -2,6 +2,7 @@
 import AIForm from './Forms/AIForm.vue'
 import AnalyticsForm from './Forms/AnalyticsForm.vue'
 import AppForm from './Forms/AppForm.vue'
+import CacheForm from './Forms/CacheForm.vue'
 
 const props = defineProps({
   name: String,
@@ -111,15 +112,10 @@ const pageTitle = computed < String > (() => options.find(option => option.key =
       </p>
 
       <div class="mt-10">
-        <template v-if="name === 'ai'">
-          <AIForm />
-        </template>
-        <template v-else-if="name === 'analytics'">
-          <AnalyticsForm />
-        </template>
-        <template v-else-if="name === 'app'">
-          <AppForm />
-        </template>
+        <template v-if="name === 'ai'"><AIForm /></template>
+        <template v-else-if="name === 'analytics'"><AnalyticsForm /></template>
+        <template v-else-if="name === 'app'"><AppForm /></template>
+        <template v-else-if="name === 'cache'"><CacheForm /></template>
         <template v-else>
           <div class="text-center">
             <div class="i-heroicons-cog-8-tooth text-gray-400 w-12 h-12 dark:text-gray-200 transition-all duration-150 ease-in-out" />
diff --git a/libs/components/Dashboard/SettingsSidebar.vue b/libs/components/Dashboard/SettingsSidebar.vue
index f087f20e44..f85d09be8f 100644
--- a/libs/components/Dashboard/SettingsSidebar.vue
+++ b/libs/components/Dashboard/SettingsSidebar.vue
@@ -44,7 +44,7 @@
         <li>
           <RouterLink to="cache" class="sidebar-links group flex items-center justify-between">
             <div class="flex items-center gap-x-2">
-              <div class="i-heroicons-square-3-stack-3d text-gray-500 w-5 h-5 dark:text-gray-200 group-hover:text-gray-700 transition duration-150 ease-in-out" />
+              <div class="i-heroicons-server text-gray-500 w-5 h-5 dark:text-gray-200 group-hover:text-gray-700 transition duration-150 ease-in-out" />
               Cache
             </div>
             <div class="i-heroicons-chevron-right text-gray-500 w-5 h-5 dark:text-gray-200 group-hover:text-gray-700 transition duration-150 ease-in-out self-end" />
diff --git a/resources/views/dashboard/settings/cache.vue b/resources/views/dashboard/settings/cache.vue
deleted file mode 100644
index c39b322f95..0000000000
--- a/resources/views/dashboard/settings/cache.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<script setup lang="ts">
-</script>
-
-<template>
-  <main>
-    <SettingsHeader />
-
-    <!-- Settings forms -->
-    <div class="divide-y divide-white/5">
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            DynamoDB
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your dynamoDB settings.
-          </p>
-        </div>
-
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-host"
-                  type="text"
-                  name="name"
-                  value="stacks.s3.amazonaws.com"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-key"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Key</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-key"
-                  type="text"
-                  name="name"
-                  value="kldsanko3njksdasjfasdn2m"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-secret"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Secret</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-secret"
-                  type="text"
-                  name="last-name"
-                  autocomplete="family-name"
-                  value="kldsanko3njksdasjfasdn2m"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-region"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Region</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-region"
-                  type="text"
-                  name="last-name"
-                  value="us-east-1"
-                  autocomplete="family-name"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-            <div class="sm:col-span-3">
-              <label
-                for="dynamo-table"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Table</label>
-              <div class="mt-2">
-                <input
-                  id="dynamo-table"
-                  type="text"
-                  name="last-name"
-                  autocomplete="family-name"
-                  value="cache"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-          </div>
-        </form>
-      </div>
-
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            Memcached
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your memcached settings.
-          </p>
-        </div>
-
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="col-span-full">
-              <label
-                for="memcached-persistent-id"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Persistent ID</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-persistent-id"
-                  type="text"
-                  value="hj3jknkjh1kjh5"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-3">
-              <label
-                for="memcached-username"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Username</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-username"
-                  name="new_password"
-                  type="text"
-                  value="username"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-3">
-              <label
-                for="memcached-password"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Password</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-password"
-                  type="password"
-                  value="test@123"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-3">
-              <label
-                for="memcached-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-host"
-                  type="text"
-                  value="stacks.s3.amazonaws.com"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-3">
-              <label
-                for="memcached-port"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Port</label>
-              <div class="mt-2">
-                <input
-                  id="memcached-port"
-                  type="text"
-                  value="11211"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-          </div>
-        </form>
-      </div>
-
-      <div class="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-10 px-4 py-16 sm:px-6 md:grid-cols-3 lg:px-8">
-        <div>
-          <h2 class="text-base font-semibold leading-7 text-gray-900 dark:text-gray-100">
-            Redis
-          </h2>
-          <p class="mt-1 text-sm leading-6 text-gray-600">
-            Update your redis settings.
-          </p>
-        </div>
-
-        <form class="md:col-span-2">
-          <div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:max-w-xl sm:grid-cols-6">
-            <div class="col-span-3">
-              <label
-                for="redis-host"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Host</label>
-              <div class="mt-2">
-                <input
-                  id="redis-host"
-                  name="new_password"
-                  type="text"
-                  value="127.0.0.1"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-3">
-              <label
-                for="redis-port"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Port</label>
-              <div class="mt-2">
-                <input
-                  id="redis-port"
-                  type="text"
-                  value="6379"
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-
-            <div class="col-span-full">
-              <label
-                for="redis-password"
-                class="block cursor-pointer text-sm font-medium leading-6 text-gray-900 dark:text-gray-100"
-              >Password</label>
-              <div class="mt-2">
-                <input
-                  id="redis-password"
-                  type="password"
-                  value=""
-                  class="block w-full px-4 py-2 text-gray-900 border border-gray-300 rounded-md shadow-sm required:border-red-500 dark:bg-blue-gray-800 dark:text-gray-200 dark:text-gray-100 dark:border-gray-600 focus:border-none focus:ring-2 focus:ring-blue-500"
-                >
-              </div>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  </main>
-</template>
diff --git a/storage/framework/types/components.d.ts b/storage/framework/types/components.d.ts
index 6e320ec4ca..d48691c48f 100644
--- a/storage/framework/types/components.d.ts
+++ b/storage/framework/types/components.d.ts
@@ -10,7 +10,9 @@ declare module 'vue' {
     ActivityFeed: typeof import('./../../../libs/components/Dashboard/Deployments/ActivityFeed.vue')['default']
     AIForm: typeof import('./../../../libs/components/Dashboard/Settings/Forms/AIForm.vue')['default']
     Alert: typeof import('./../../../libs/components/Dashboard/Modals/Popups/Alert.vue')['default']
+    AnalyticsForm: typeof import('./../../../libs/components/Dashboard/Settings/Forms/AnalyticsForm.vue')['default']
     AppButton: typeof import('./../../../libs/components/Dashboard/Buttons/AppButton.vue')['default']
+    AppForm: typeof import('./../../../libs/components/Dashboard/Settings/Forms/AppForm.vue')['default']
     BaseModal: typeof import('./../../../libs/components/Dashboard/Modals/BaseModal.vue')['default']
     Button: typeof import('./../../../libs/components/Button.vue')['default']
     CacheForm: typeof import('./../../../libs/components/Dashboard/Settings/Forms/CacheForm.vue')['default']
diff --git a/storage/framework/types/dashboard-router.d.ts b/storage/framework/types/dashboard-router.d.ts
index 3d3aead73c..b2ddb3df91 100644
--- a/storage/framework/types/dashboard-router.d.ts
+++ b/storage/framework/types/dashboard-router.d.ts
@@ -42,7 +42,6 @@ declare module 'vue-router/auto-routes' {
     '/requests/': RouteRecordInfo<'/requests/', '/requests', Record<never, never>, Record<never, never>>,
     '/settings/[name]': RouteRecordInfo<'/settings/[name]', '/settings/:name', { name: ParamValue<true> }, { name: ParamValue<false> }>,
     '/settings/billing': RouteRecordInfo<'/settings/billing', '/settings/billing', Record<never, never>, Record<never, never>>,
-    '/settings/cache': RouteRecordInfo<'/settings/cache', '/settings/cache', Record<never, never>, Record<never, never>>,
     '/settings/database': RouteRecordInfo<'/settings/database', '/settings/database', Record<never, never>, Record<never, never>>,
     '/settings/mail': RouteRecordInfo<'/settings/mail', '/settings/mail', Record<never, never>, Record<never, never>>,
     '/settings/queue': RouteRecordInfo<'/settings/queue', '/settings/queue', Record<never, never>, Record<never, never>>,