diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index ff99e169..a01da514 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -97,7 +97,7 @@ export function Chat({ messages, setMessages, query, setQuery, selectedPath, set
         if (!canvas) return
         setSelectedPath(prev => {
             if (prev) {
-                if (isPathResponse && paths.some((path) => [...path.nodes, ...path.links].every((e: any) => [...prev.nodes, ...prev.links].some((e: any) => e.id === e.id)))) {
+                if (isPathResponse && paths.some((path) => [...path.nodes, ...path.links].every((e: any) => [...prev.nodes, ...prev.links].some((el: any) => el.id === e.id)))) {
                     graph.getElements().forEach(link => {
                         const { id } = link
 
diff --git a/app/components/code-graph.tsx b/app/components/code-graph.tsx
index b75f9ef1..84bb739f 100644
--- a/app/components/code-graph.tsx
+++ b/app/components/code-graph.tsx
@@ -105,7 +105,7 @@ export function CodeGraph({
     useEffect(() => {
         const handleKeyDown = (event: KeyboardEvent) => {
             if (event.key === 'Delete') {
-                if (selectedObj && selectedObjects.length === 0) return
+                if (selectedObjects.length === 0 && !selectedObj) return
                 handleRemove([...selectedObjects.map(obj => obj.id), selectedObj?.id].filter(id => id !== undefined), "nodes");
             }
         };
diff --git a/app/components/dataPanel.tsx b/app/components/dataPanel.tsx
index b1d84e38..4a50434f 100644
--- a/app/components/dataPanel.tsx
+++ b/app/components/dataPanel.tsx
@@ -18,7 +18,6 @@ const excludedProperties = [
     "expand",
     "collapsed",
     "isPath",
-    "isPathSelected",
     "visible",
     "index",
     "curve",
diff --git a/app/components/graphView.tsx b/app/components/graphView.tsx
index aefda794..9ea3a2fe 100644
--- a/app/components/graphView.tsx
+++ b/app/components/graphView.tsx
@@ -164,7 +164,10 @@ export default function GraphView({
     }, [zoomedNodes, cooldownTicks, canvasRef])
 
     const nodeCanvasObject = useCallback((node: GraphNode, ctx: CanvasRenderingContext2D) => {
-        if (!node.x || !node.y) return
+        if (node.x === undefined || node.y === undefined) {
+            node.x = 0;
+            node.y = 0;
+        }
 
         const isHovered = !!hoverElement && !('source' in hoverElement) && hoverElement.id === node.id
         const isSelected = selectedObjects.some(obj => obj.id === node.id) || selectedObj?.id === node.id
@@ -231,7 +234,10 @@ export default function GraphView({
     }, [selectedObj, selectedObjects, isPathResponse, hoverElement])
 
     const nodePointerAreaPaint = useCallback((node: GraphNode, color: string, ctx: CanvasRenderingContext2D) => {
-        if (!node.x || !node.y) return
+        if (node.x === undefined || node.y === undefined) {
+            node.x = 0;
+            node.y = 0;
+        }
 
         ctx.fillStyle = color;
         ctx.beginPath();
diff --git a/app/components/model.ts b/app/components/model.ts
index 61626443..7253fa26 100644
--- a/app/components/model.ts
+++ b/app/components/model.ts
@@ -210,6 +210,8 @@ export class Graph {
 
         }
         this.nodesMap.set(edgeData.src_node, source)
+        this.elements.nodes.push(source)
+        newElements.nodes.push(source)
       }
 
       if (!target) {
@@ -227,6 +229,8 @@ export class Graph {
           }
         }
         this.nodesMap.set(edgeData.dest_node, target)
+        this.elements.nodes.push(target)
+        newElements.nodes.push(target)
       }
 
       let label = this.labelsMap.get(edgeData.relation)
diff --git a/app/globals.css b/app/globals.css
index 26324540..1a377faf 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -127,13 +127,4 @@
 
 ::-webkit-scrollbar-thumb:hover {
   background-color: #a8bbbf;
-}
-
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
 }
\ No newline at end of file
diff --git a/app/page.tsx b/app/page.tsx
index f8f465c5..3a5c91de 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -368,7 +368,7 @@ export default function Home() {
         <header className="flex flex-col text-xl">
           <div className="flex items-center justify-between py-4 px-8">
             <div className="flex gap-4 items-center">
-              <Link href="https://www.falkordb.com" target='_blank'>
+              <Link href="https://www.falkordb.com" target='_blank' rel="noopener noreferrer">
                 <Image src="/logo_02.svg" alt="FalkorDB" width={27.73} height={23.95} />
               </Link>
               <h1 className='font-bold text-[22px]'>
@@ -376,15 +376,15 @@ export default function Home() {
               </h1>
             </div>
             <ul className="flex gap-4 items-center font-medium">
-              <Link title="Home" className="flex gap-2.5 items-center p-4" href="https://www.falkordb.com" target='_blank'>
+              <Link title="Home" className="flex gap-2.5 items-center p-4" href="https://www.falkordb.com" target='_blank' rel="noopener noreferrer">
                 <HomeIcon />
                 <p>Main Website</p>
               </Link>
-              <Link title="Github" className="flex gap-2.5 items-center p-4" href="https://github.com/FalkorDB/code-graph" target='_blank'>
+              <Link title="Github" className="flex gap-2.5 items-center p-4" href="https://github.com/FalkorDB/code-graph" target='_blank' rel="noopener noreferrer">
                 <Github />
                 <p>Github</p>
               </Link>
-              <Link title="Discord" className="flex gap-2.5 items-center p-4" href="https://discord.gg/falkordb" target='_blank'>
+              <Link title="Discord" className="flex gap-2.5 items-center p-4" href="https://discord.gg/falkordb" target='_blank' rel="noopener noreferrer">
                 <BoomBox />
                 <p>Discord</p>
               </Link>
@@ -534,7 +534,7 @@ export default function Home() {
       </div>
       <div className='flex flex-col md:hidden h-full overflow-hidden' id='mobile'>
         <header className='flex justify-center items-center relative bg-gray-100'>
-          <Link href="https://www.falkordb.com" target='_blank'>
+          <Link href="https://www.falkordb.com" target='_blank' rel="noopener noreferrer">
             <Image priority style={{ width: 'auto', height: '70px', background: "transparent" }} src="/code-graph-logo.svg" alt="FalkorDB" width={0} height={0} />
           </Link>
           <button className='absolute top-6 right-4' onClick={() => setMenuOpen(prev => !prev)}>
@@ -546,17 +546,17 @@ export default function Home() {
           <div className='absolute bottom-0 top-[70px] left-0 right-0 z-20 bg-white shadow-lg'>
             <ul className='h-full flex flex-col gap-16 p-8 items-center'>
               <li>
-                <Link href="https://github.com/FalkorDB/code-graph" target='_blank'>
+                <Link href="https://github.com/FalkorDB/code-graph" target='_blank' rel="noopener noreferrer">
                   <p>Github</p>
                 </Link>
               </li>
               <li>
-                <Link href="https://discord.gg/falkordb" target='_blank'>
+                <Link href="https://discord.gg/falkordb" target='_blank' rel="noopener noreferrer">
                   <p>Discord</p>
                 </Link>
               </li>
               <li>
-                <Link href="https://www.falkordb.com" target='_blank'>
+                <Link href="https://www.falkordb.com" target='_blank' rel="noopener noreferrer">
                   <p>Main Website</p>
                 </Link>
               </li>
@@ -614,7 +614,7 @@ export default function Home() {
             searchNode={searchNode}
             cooldownTicks={cooldownTicks}
             setCooldownTicks={setCooldownTicks}
-            onCategoryClick={(name, show) => onCategoryClick(name, show, desktopChartRef)}
+            onCategoryClick={(name, show) => onCategoryClick(name, show, mobileChartRef)}
             handleDownloadImage={handleDownloadImage}
             zoomedNodes={zoomedNodes}
             setZoomedNodes={setZoomedNodes}
diff --git a/package-lock.json b/package-lock.json
index c3a5dc05..6aa0541b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "code-graph",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "code-graph",
-      "version": "0.2.0",
+      "version": "0.3.0",
       "dependencies": {
         "@falkordb/canvas": "^0.0.41",
         "@radix-ui/react-checkbox": "^1.1.4",
diff --git a/package.json b/package.json
index cd22ff9a..4a1f7d40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-graph",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": true,
   "scripts": {
     "dev": "HOST=0.0.0.0 PORT=3000 next dev",