diff --git a/app/api/graph/model.ts b/app/api/graph/model.ts
index 91df1a2..27ae450 100644
--- a/app/api/graph/model.ts
+++ b/app/api/graph/model.ts
@@ -209,7 +209,7 @@ export class Graph {
         return new Graph(graphName || "", [], [], { nodes: [], links: [] }, new Map<string, Category>(), new Map<string, Category>(), new Map<number, Node>(), new Map<number, Link>(), colors)
     }
 
-    public static create(id: string, results: any, colors?: string[]): Graph {
+    public static create(id: string, results: { data: Data, metadata: any[] }, colors?: string[]): Graph {
         const graph = Graph.empty(undefined, colors)
         graph.extend(results)
         graph.id = id
diff --git a/app/graph/View.tsx b/app/graph/View.tsx
index 201fa0a..a33c2aa 100644
--- a/app/graph/View.tsx
+++ b/app/graph/View.tsx
@@ -20,7 +20,9 @@ export default function View({ graph, setGraph, selectedValue }: {
 
     const handlePreferencesChange = (colors?: string[]) => {
         setGraph(Graph.create(graph.Id, { data: graph.Data, metadata: graph.Metadata }, colors || colorsArr))
-        if (colors) return
+        if (colors) {
+            localStorage.removeItem(graph.Id)
+        }
         localStorage.setItem(graph.Id, JSON.stringify(colorsArr));
     }
 
@@ -40,9 +42,9 @@ export default function View({ graph, setGraph, selectedValue }: {
             className="w-[30%] h-[50%]"
             title="Preferences"
         >
-            <div className="h-full flex flex-col gap-8">
+            <div className="h-full flex flex-col gap-8 overflow-hidden">
                 <p className="text-xl">Legends</p>
-                <ul className="flex flex-col gap-4 overflow-auto">
+                <ul className="flex flex-col gap-4 p-2 overflow-auto">
                     {
                         colorsArr.map((c, i) => (
                             <li onMouseEnter={() => setHover(c)} onMouseLeave={(() => setHover(""))} key={c} className={cn(`flex gap-8 items-center`)}>
@@ -154,7 +156,7 @@ export default function View({ graph, setGraph, selectedValue }: {
                         <RotateCcw />
                     </Button>
                     <Button
-                        disabled={graph.Colors.filter((c, i) => c === colorsArr[i]).length === colorsArr.length && DEFAULT_COLORS.length === colorsArr.length}
+                        disabled={graph.Colors.every((c) => colorsArr.some(color => color === c)) && graph.Colors.length === colorsArr.length}
                         variant="Primary"
                         label="Apply"
                         onClick={() => handlePreferencesChange()}
diff --git a/app/schema/SchemaView.tsx b/app/schema/SchemaView.tsx
index ce23fc0..f9019eb 100644
--- a/app/schema/SchemaView.tsx
+++ b/app/schema/SchemaView.tsx
@@ -337,7 +337,7 @@ export default function SchemaView({ schema, fetchCount, session }: Props) {
                         }}
                         onDeleteElement={handleDeleteElement}
                         chartRef={chartRef}
-                        addDisabled={session?.user.role === "Read-Only"}
+                        addDisabled={session?.user.role === "Read-Only" || !schema.Id}
                     />
                     {
                         isCollapsed &&