diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index a9012ca68..1e85d2eb3 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -213,7 +213,9 @@ export default function Page({ flow }: { flow: FlowType }) {
       });
 
       // Generate a unique node ID
+      let { type } = data;
       let newId = getNodeId();
+      newId = `${type}_${newId}`;
       let newNode: NodeType;
 
       if (data.type !== "groupNode") {
@@ -317,53 +319,53 @@ export default function Page({ flow }: { flow: FlowType }) {
           <div className="w-full h-full" ref={reactFlowWrapper}>
             {Object.keys(templates).length > 0 &&
             Object.keys(types).length > 0 ? (
-                <div className="w-full h-full">
-                  <ReactFlow
-                    nodes={nodes}
-                    onMove={() => {
-                      updateFlow({
-                        ...flow,
-                        data: reactFlowInstance.toObject(),
-                      });
-                    }}
-                    edges={edges}
-                    onPaneClick={() => {
-                      setDisableCopyPaste(false);
-                    }}
-                    onPaneMouseLeave={() => {
-                      setDisableCopyPaste(true);
-                    }}
-                    onNodesChange={onNodesChange}
-                    onEdgesChange={onEdgesChangeMod}
-                    onConnect={onConnect}
-                    disableKeyboardA11y={true}
-                    onLoad={setReactFlowInstance}
-                    onInit={setReactFlowInstance}
-                    nodeTypes={nodeTypes}
-                    onEdgeUpdate={onEdgeUpdate}
-                    onEdgeUpdateStart={onEdgeUpdateStart}
-                    onEdgeUpdateEnd={onEdgeUpdateEnd}
-                    onNodeDragStart={onNodeDragStart}
-                    onSelectionDragStart={onSelectionDragStart}
-                    onSelectionEnd={onSelectionEnd}
-                    onSelectionStart={onSelectionStart}
-                    onEdgesDelete={onEdgesDelete}
-                    connectionLineComponent={ConnectionLineComponent}
-                    onDragOver={onDragOver}
-                    onDrop={onDrop}
-                    onNodesDelete={onDelete}
-                    onSelectionChange={onSelectionChange}
-                    nodesDraggable={!disableCopyPaste}
-                    panOnDrag={!disableCopyPaste}
-                    zoomOnDoubleClick={!disableCopyPaste}
-                    selectNodesOnDrag={false}
-                    className="theme-attribution"
-                  >
-                    <Background className="dark:bg-gray-900" />
-                    <Controls className="[&>button]:text-black  [&>button]:dark:bg-gray-800 hover:[&>button]:dark:bg-gray-700 [&>button]:dark:text-gray-400 [&>button]:dark:fill-gray-400 [&>button]:dark:border-gray-600"></Controls>
-                  </ReactFlow>
-                  <Chat flow={flow} reactFlowInstance={reactFlowInstance} />
-                </div>
+              <div className="w-full h-full">
+                <ReactFlow
+                  nodes={nodes}
+                  onMove={() => {
+                    updateFlow({
+                      ...flow,
+                      data: reactFlowInstance.toObject(),
+                    });
+                  }}
+                  edges={edges}
+                  onPaneClick={() => {
+                    setDisableCopyPaste(false);
+                  }}
+                  onPaneMouseLeave={() => {
+                    setDisableCopyPaste(true);
+                  }}
+                  onNodesChange={onNodesChange}
+                  onEdgesChange={onEdgesChangeMod}
+                  onConnect={onConnect}
+                  disableKeyboardA11y={true}
+                  onLoad={setReactFlowInstance}
+                  onInit={setReactFlowInstance}
+                  nodeTypes={nodeTypes}
+                  onEdgeUpdate={onEdgeUpdate}
+                  onEdgeUpdateStart={onEdgeUpdateStart}
+                  onEdgeUpdateEnd={onEdgeUpdateEnd}
+                  onNodeDragStart={onNodeDragStart}
+                  onSelectionDragStart={onSelectionDragStart}
+                  onSelectionEnd={onSelectionEnd}
+                  onSelectionStart={onSelectionStart}
+                  onEdgesDelete={onEdgesDelete}
+                  connectionLineComponent={ConnectionLineComponent}
+                  onDragOver={onDragOver}
+                  onDrop={onDrop}
+                  onNodesDelete={onDelete}
+                  onSelectionChange={onSelectionChange}
+                  nodesDraggable={!disableCopyPaste}
+                  panOnDrag={!disableCopyPaste}
+                  zoomOnDoubleClick={!disableCopyPaste}
+                  selectNodesOnDrag={false}
+                  className="theme-attribution"
+                >
+                  <Background className="dark:bg-gray-900" />
+                  <Controls className="[&>button]:text-black  [&>button]:dark:bg-gray-800 hover:[&>button]:dark:bg-gray-700 [&>button]:dark:text-gray-400 [&>button]:dark:fill-gray-400 [&>button]:dark:border-gray-600"></Controls>
+                </ReactFlow>
+                <Chat flow={flow} reactFlowInstance={reactFlowInstance} />
+              </div>
             ) : (
               <></>
             )}
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index fd8f23dbd..f445a9b5f 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -1,9 +1,4 @@
-import {
-  Bars2Icon,
-  PencilSquareIcon,
-  Square2StackIcon,
-  TrashIcon,
-} from "@heroicons/react/24/outline";
+import { Bars2Icon } from "@heroicons/react/24/outline";
 import DisclosureComponent from "../DisclosureComponent";
 import {
   classNames,
@@ -11,18 +6,17 @@ import {
   nodeIcons,
   nodeNames,
 } from "../../../../utils";
-import { useContext, useEffect, useState, useRef } from "react";
+import { useContext, useState } from "react";
 import { typesContext } from "../../../../contexts/typesContext";
 import { APIClassType, APIObjectType } from "../../../../types/api";
 import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
 import ShadTooltip from "../../../../components/ShadTooltipComponent";
-import { Code, Code2, FileDown, FileUp, Import, Save } from "lucide-react";
+import { Code2, FileDown, FileUp, Save } from "lucide-react";
 import { PopUpContext } from "../../../../contexts/popUpContext";
 import ImportModal from "../../../../modals/importModal";
 import ExportModal from "../../../../modals/exportModal";
 import ApiModal from "../../../../modals/ApiModal";
 import { TabsContext } from "../../../../contexts/tabsContext";
-import { Separator } from "../../../../components/ui/separator";
 import { alertContext } from "../../../../contexts/alertContext";
 import { updateFlowInDatabase } from "../../../../controllers/API";
 import { INPUT_STYLE } from "../../../../constants";
@@ -126,7 +120,7 @@ export default function ExtraSidebar() {
           </button>
         </ShadTooltip>
       </div>
-      <Separator />
+      {/* <Separator /> */}
       <div className="relative mt-2 flex items-center mb-2 mx-2">
         <input
           type="text"