diff --git a/apps/web/src/components/navbar/DatabaseManagement/forms/AddDatabase/newdatabase.tsx b/apps/web/src/components/navbar/DatabaseManagement/forms/AddDatabase/newdatabase.tsx
index cd6ffb4a98ad29a3f236e970f45a27bf1728ac97..67105ecc5cf540b8a311652b42aa6ee41f8fada0 100644
--- a/apps/web/src/components/navbar/DatabaseManagement/forms/AddDatabase/newdatabase.tsx
+++ b/apps/web/src/components/navbar/DatabaseManagement/forms/AddDatabase/newdatabase.tsx
@@ -146,7 +146,7 @@ export const NewDatabaseForm = (props: { onClose(): void; open: boolean }) => {
   }
 
   return (
-    <Dialog open={props.open} onClose={props.onClose}>
+    <Dialog open={props.open} onClose={props.onClose} className="lg:min-w-[50rem] ">
       <div className="flex justify-between align-center">
         <h1 className="card-title">New Database</h1>
         <div>
@@ -167,9 +167,13 @@ export const NewDatabaseForm = (props: { onClose(): void; open: boolean }) => {
       </div>
 
       {sampleData ? (
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-2 lg:grid-cols-3 gap-2">
           {mockDatabases.map((sample) => (
-            <div key={sample.name} className="card hover:bg-base-100 cursor-pointer mb-2 border" onClick={() => loadMockDatabase(sample)}>
+            <div
+              key={sample.name}
+              className="card hover:bg-base-100 cursor-pointer mb-2 border w-[15rem]"
+              onClick={() => loadMockDatabase(sample)}
+            >
               <div className="card-body">
                 <h2 className="card-title">{sample.name}</h2>
                 <p className="font-light text-slate-400">{sample.subtitle}</p>
diff --git a/apps/web/src/components/navbar/databasemenu.tsx b/apps/web/src/components/navbar/databasemenu.tsx
index 964309b1adf039b4db7d38ca3516602a2e518571..f5ae99103f0c85f0377e34f41ab437f35b064012 100644
--- a/apps/web/src/components/navbar/databasemenu.tsx
+++ b/apps/web/src/components/navbar/databasemenu.tsx
@@ -6,11 +6,12 @@ export const DatabaseMenu = (props: { onClick: (database: string) => void }) =>
 
   return (
     <ul className="menu dropdown-content absolute right-48 z-[1] p-2 shadow-xl bg-offwhite-100 rounded-box w-52" tabIndex={0}>
-      {session.databases.map((db: any) => (
-        <li key={db.Name}>
-          <button onClick={() => props.onClick(db.Name)}>{db.Name}</button>
-        </li>
-      ))}
+      {session.databases &&
+        session.databases.map((db: any) => (
+          <li key={db.Name}>
+            <button onClick={() => props.onClick(db.Name)}>{db.Name}</button>
+          </li>
+        ))}
     </ul>
   );
 };
diff --git a/libs/shared/lib/components/Dialog.tsx b/libs/shared/lib/components/Dialog.tsx
index 1dbb2e7714bc7e96fe5b8c531e626e31f0d799c9..30ec249f40a15bfc03ff50b68107360e82671be1 100644
--- a/libs/shared/lib/components/Dialog.tsx
+++ b/libs/shared/lib/components/Dialog.tsx
@@ -4,6 +4,7 @@ export type DialogProps = {
   onClose: () => void;
   open: boolean;
   children?: React.ReactNode;
+  className?: string;
 };
 
 export const Dialog = (props: DialogProps) => {
@@ -15,8 +16,8 @@ export const Dialog = (props: DialogProps) => {
   }, [props.open]);
 
   return (
-    <dialog className="modal" ref={ref} onClose={() => props.onClose()}>
-      <form method="dialog" className="modal-box card flex gap-4">
+    <dialog className={"modal"} ref={ref} onClose={() => props.onClose()}>
+      <form method="dialog" className={"modal-box card flex gap-4 " + (props?.className ? props?.className : "")}>
         {props.children}
       </form>
       <form method="dialog" className="modal-backdrop">
diff --git a/libs/shared/lib/data-access/store/sessionSlice.ts b/libs/shared/lib/data-access/store/sessionSlice.ts
index 89b6ead98a601a9576eb94a5097f1cd01384ece8..d3d94aa8b83ca0f3dc55a226b534005a6be2084d 100644
--- a/libs/shared/lib/data-access/store/sessionSlice.ts
+++ b/libs/shared/lib/data-access/store/sessionSlice.ts
@@ -34,8 +34,6 @@ export const sessionSlice = createSlice({
       state.databases = action.payload;
       if (state.databases.length > 0) {
         const foundDatabase = state.databases.find((db) => db.Name === state.currentDatabase);
-        console.log(foundDatabase);
-        
         if (!foundDatabase) {
           state.currentDatabase = state.databases[0].Name;
         } else {
diff --git a/libs/shared/lib/querybuilder/model/graphology/utils.ts b/libs/shared/lib/querybuilder/model/graphology/utils.ts
index e46dd9ac7455a03ef55f9bd3fcda2b265a82bdae..d97b7fadaf5ce92bb5551a7f7939aafa531b4935 100644
--- a/libs/shared/lib/querybuilder/model/graphology/utils.ts
+++ b/libs/shared/lib/querybuilder/model/graphology/utils.ts
@@ -102,8 +102,6 @@ export class QueryMultiGraphology extends Graph<QueryGraphNodes, QueryGraphEdges
       throw Error('using wrong function! use addLogicPill2Graphology instead');
     }
 
-    console.log(attributes);
-
     // Add a node to the graphology object
     this.addNode(attributes.id, { ...attributes });