diff --git a/keep-ui/app/builder/builder-card.tsx b/keep-ui/app/builder/builder-card.tsx
index 2eae622d4..3d6e0b99a 100644
--- a/keep-ui/app/builder/builder-card.tsx
+++ b/keep-ui/app/builder/builder-card.tsx
@@ -1,7 +1,7 @@
 import { ExclamationCircleIcon } from "@heroicons/react/24/outline";
 import { Card, Callout } from "@tremor/react";
 import dynamic from "next/dynamic";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import useSWR from "swr";
 import { getApiURL } from "../../utils/apiUrl";
 import Loader from "./loader";
@@ -36,10 +36,12 @@ export function BuilderCard({
     fetcher(url, accessToken)
   );
 
-  if (data && !providers) {
-    setProviders(data.providers);
-    enableButtons();
-  }
+  useEffect(() => {
+    if (data && !providers) {
+      setProviders(data.providers);
+      enableButtons();
+    }
+  }, [data, providers, enableButtons]);
 
   return (
     <Card
diff --git a/keep-ui/app/builder/page.client.tsx b/keep-ui/app/builder/page.client.tsx
index a3d675169..f1466c1f1 100644
--- a/keep-ui/app/builder/page.client.tsx
+++ b/keep-ui/app/builder/page.client.tsx
@@ -6,6 +6,7 @@ import {
   PlusIcon,
   ArrowDownOnSquareIcon,
   BoltIcon,
+  ArrowUpOnSquareIcon,
 } from "@heroicons/react/20/solid";
 import { useSession } from "../../utils/customAuth";
 import { BuilderCard } from "./builder-card";
@@ -41,7 +42,12 @@ export default function PageClient() {
     };
     reader.readAsText(file);
   }
-  if (status === "loading") return <div><Loading/></div>;
+  if (status === "loading")
+    return (
+      <div>
+        <Loading />
+      </div>
+    );
   if (status === "unauthenticated") return <div>Unauthenticated...</div>;
 
   return (
@@ -63,6 +69,16 @@ export default function PageClient() {
           >
             New
           </Button>
+          <Button
+            color="orange"
+            size="md"
+            className="mr-2"
+            variant="secondary"
+            icon={ArrowUpOnSquareIcon}
+            disabled={true}
+          >
+            Save 👷‍♀️
+          </Button>
           <Button
             color="orange"
             size="md"
diff --git a/keep-ui/app/builder/page.css b/keep-ui/app/builder/page.css
index 9030883ae..8d1c3cd58 100644
--- a/keep-ui/app/builder/page.css
+++ b/keep-ui/app/builder/page.css
@@ -19,3 +19,9 @@
 .sqd-toolbox-item-text {
   text-transform: capitalize;
 }
+
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
+}
diff --git a/keep-ui/package-lock.json b/keep-ui/package-lock.json
index d6b0c38f6..01eec255c 100644
--- a/keep-ui/package-lock.json
+++ b/keep-ui/package-lock.json
@@ -16,7 +16,7 @@
         "@headlessui/react": "^1.7.14",
         "@heroicons/react": "^2.0.18",
         "@svgr/webpack": "^8.0.1",
-        "@tremor/react": "^2.7.0",
+        "@tremor/react": "^2.11.0",
         "acorn": "^8.8.2",
         "acorn-jsx": "^5.3.2",
         "add": "^2.0.6",
@@ -3185,9 +3185,9 @@
       }
     },
     "node_modules/@tremor/react": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/@tremor/react/-/react-2.8.2.tgz",
-      "integrity": "sha512-ncEt2ys/0LZVTeqWAL2pMHzTFRjmAiSh873PjU5TyH+WS6pDn60Ny7jy0SSW1I0KmQsN/uHzdOSdDpga9m2FCQ==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@tremor/react/-/react-2.11.0.tgz",
+      "integrity": "sha512-UdIpFHVm5F7vRml9IL3CrIl7doxgg8a5q89ht/dUF7hVBjd7veSbYdfCQCHV1yfjmCqTXjeMAeP3N1ObfwAwCw==",
       "dependencies": {
         "@floating-ui/react": "^0.19.1",
         "date-fns": "^2.28.0",
diff --git a/keep-ui/package.json b/keep-ui/package.json
index eb23dc1df..11618165f 100644
--- a/keep-ui/package.json
+++ b/keep-ui/package.json
@@ -17,7 +17,7 @@
     "@headlessui/react": "^1.7.14",
     "@heroicons/react": "^2.0.18",
     "@svgr/webpack": "^8.0.1",
-    "@tremor/react": "^2.7.0",
+    "@tremor/react": "^2.11.0",
     "acorn": "^8.8.2",
     "acorn-jsx": "^5.3.2",
     "add": "^2.0.6",