diff --git a/components/Editor/Bar.tsx b/components/Editor/Bar.tsx
index a05304a..ee99779 100644
--- a/components/Editor/Bar.tsx
+++ b/components/Editor/Bar.tsx
@@ -1,30 +1,42 @@
-import {
-  PanelTop,
-  Spline
-} from "lucide-react";
-import { useReactFlow } from "reactflow";
+import { PanelTop, Spline } from "lucide-react"
+import { useReactFlow } from "reactflow"
+import { useEffect } from "react"
 
 export type Bar = {
-  onCreateNode: (newNode: { type: string; data: any; position: any }) => void;
-  addEdgeMode: boolean;
-  setAddEdgeMode: (state: boolean) => void;
-};
+  onCreateNode: (newNode: { type: string; data: any; position: any }) => void
+  addEdgeMode: boolean
+  setAddEdgeMode: (state: boolean) => void
+}
 
 export function Bar({ onCreateNode, addEdgeMode, setAddEdgeMode }: Bar) {
-  const flow = useReactFlow();
+  const flow = useReactFlow()
+
+  useEffect(() => {
+    const handleKeyDown = (event) => {
+      if (event.keyCode === 27) {
+        // Escape key was pressed
+        setAddEdgeMode(false)
+      }
+    }
+
+    document.addEventListener("keydown", handleKeyDown)
 
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown)
+    }
+  }, [setAddEdgeMode])
 
   return (
     <div className="absolute left-[15px] top-[4.75rem] flex flex-col overflow-hidden rounded bg-white drop-shadow-sm dark:bg-neutral-800">
       <Button
         onClick={() =>
           onCreateNode({
-            type: 'Class',
+            type: "Class",
             data: {
-              name: 'Class',
-              type: 'Class',
+              name: "Class",
+              type: "Class",
               attributes: [],
-              methods: []
+              methods: [],
             },
             position: flow.project({
               x: window.innerWidth / 2,
@@ -35,14 +47,11 @@ export function Bar({ onCreateNode, addEdgeMode, setAddEdgeMode }: Bar) {
       >
         <PanelTop size={18} strokeWidth={2} />
       </Button>
-      <Button
-        active={addEdgeMode}
-        onClick={() => setAddEdgeMode(!addEdgeMode)}
-      >
+      <Button active={addEdgeMode} onClick={() => setAddEdgeMode(!addEdgeMode)}>
         <Spline size={18} strokeWidth={2} />
       </Button>
     </div>
-  );
+  )
 }
 
 function Button({
@@ -50,16 +59,18 @@ function Button({
   active,
   onClick,
 }: {
-  children: React.ReactNode;
-  active?: boolean;
-  onClick?: () => void;
+  children: React.ReactNode
+  active?: boolean
+  onClick?: () => void
 }) {
   return (
     <button
-      className={`border-t border-neutral-900/10 p-2 duration-200 first-of-type:border-t-transparent hover:bg-white/10 active:bg-white/20 dark:border-white/10 ${active && "bg-black/10 text-indigo-400 "}`}
+      className={`border-t border-neutral-900/10 p-2 duration-200 first-of-type:border-t-transparent hover:bg-white/10 active:bg-white/20 dark:border-white/10 ${
+        active && "bg-black/10 text-indigo-400 "
+      }`}
       onClick={onClick ?? undefined}
     >
       {children}
     </button>
-  );
-}
\ No newline at end of file
+  )
+}
diff --git a/components/Editor/Nodes/index.tsx b/components/Editor/Nodes/index.tsx
index ba68e70..16801ee 100644
--- a/components/Editor/Nodes/index.tsx
+++ b/components/Editor/Nodes/index.tsx
@@ -1,50 +1,65 @@
-import { useCallback, useEffect, useState } from "react";
-import Class from "./Class";
-import { Connection, Edge, Node, MarkerType, addEdge, NodeChange, applyNodeChanges, OnNodesChange, OnEdgesChange, OnConnect, EdgeChange } from "reactflow";
-import { initialDataState } from "@/types/ClassDiagram";
+import { useCallback, useEffect, useState } from "react"
+import {
+  Connection,
+  Edge,
+  EdgeChange,
+  MarkerType,
+  Node,
+  NodeChange,
+  OnConnect,
+  OnEdgesChange,
+  OnNodesChange,
+  addEdge,
+  applyNodeChanges,
+} from "reactflow"
+
+import { initialDataState } from "@/types/ClassDiagram"
+
+import Class from "./Class"
 
 export type NodesState = {
-  nodes: Node[];
-  edges: Edge[];
-  addNode: (node: Node) => void;
-  editNode: (id: string, newData: any) => void;
-  deleteNode: (id: string) => void;
-  setEdgeAnimationState: (id: string, state: boolean) => void;
-  onNodesChange: OnNodesChange;
-  onEdgesChange: OnEdgesChange;
-  onConnect: OnConnect;
-  addEdgeMode: boolean;
-  setAddEdgeMode: (state: boolean) => void;
-};
+  nodes: Node[]
+  edges: Edge[]
+  addNode: (node: Node) => void
+  editNode: (id: string, newData: any) => void
+  deleteNode: (id: string) => void
+  setEdgeAnimationState: (id: string, state: boolean) => void
+  onNodesChange: OnNodesChange
+  onEdgesChange: OnEdgesChange
+  onConnect: OnConnect
+  addEdgeMode: boolean
+  setAddEdgeMode: (state: boolean) => void
+}
 
 export declare namespace Nodes {
-  export {
-    Class,
-  };
+  export { Class }
 }
 
 export namespace Nodes {
-  Nodes.Class = Class;
+  Nodes.Class = Class
 
   export const nodeTypes = {
-    Class: Nodes.Class
-  };
+    Class: Nodes.Class,
+  }
 
   export function useNodesState(Data: initialDataState): NodesState {
-    const { nodes: initialNodes, edges: initialEdges } = Data;
-    
-    const [nodes, setNodes] = useState<Node[]>(initialNodes);
-    const [edges, setEdges] = useState<Edge[]>(initialEdges);
+    const { nodes: initialNodes, edges: initialEdges } = Data
 
-    const [addEdgeMode, setAddEdgeMode] = useState(false);
+    const [nodes, setNodes] = useState<Node[]>(initialNodes)
+    const [edges, setEdges] = useState<Edge[]>(initialEdges)
 
-    const addNode = useCallback((node: Node) => {
-      setNodes([...nodes, node]);
-    }, [nodes, setNodes]);
+    const [addEdgeMode, setAddEdgeMode] = useState(false)
+
+    const addNode = useCallback(
+      (node: Node) => {
+        setNodes([...nodes, node])
+      },
+      [nodes, setNodes]
+    )
 
     const editNode = useCallback((id: string, newData: any) => {
-      setNodes(nodes => {
-        return nodes.map(node => {
+      setNodes((nodes) => {
+        return nodes.map((node) => {
           if (node.id === id) {
             return {
               ...node,
@@ -52,49 +67,72 @@ export namespace Nodes {
                 ...node.data,
                 ...newData,
               },
-            };
+            }
           }
-          return node;
-        });
-      });
-    }, []);
-    
-
-    const deleteNode = useCallback((id: string) => {
-      setNodes(nodes.filter((node) => node.id !== id));
-      setEdges(edges.filter((edge) => edge.source !== id && edge.target !== id));
-    }, [nodes, edges]);
-
-    const setEdgeAnimationState = useCallback((id: string, state: boolean) => {
-      setEdges(
-        edges.map((edge) => {
-          if (edge.id === id) {
-            return {
-              ...edge,
-              animated: state,
-            };
-          }
-          return edge;
+          return node
         })
-      );
-    }, [edges]);
-
-    const onNodesChange = useCallback((nodeChanges: NodeChange[]) => {
-      setNodes((nodes) => applyNodeChanges(nodeChanges, nodes));
-    }, [setNodes]);
-
-    const onEdgesChange = useCallback((edgesChange: EdgeChange[]) => {
-      setEdges(edges);
-    }, [edges]);
-
-    const onConnect = useCallback((params: Edge | Connection) =>
-      setEdges((eds) =>
-        addEdge({ ...params, type: 'floating', markerEnd: { type: MarkerType.Arrow } }, eds)
-      ),
-      [setEdges]
-    );
-
-
+      })
+    }, [])
+
+    const deleteNode = useCallback(
+      (id: string) => {
+        setNodes(nodes.filter((node) => node.id !== id))
+        setEdges(
+          edges.filter((edge) => edge.source !== id && edge.target !== id)
+        )
+      },
+      [nodes, edges]
+    )
+
+    const setEdgeAnimationState = useCallback(
+      (id: string, state: boolean) => {
+        setEdges(
+          edges.map((edge) => {
+            if (edge.id === id) {
+              return {
+                ...edge,
+                animated: state,
+              }
+            }
+            return edge
+          })
+        )
+      },
+      [edges]
+    )
+
+    const onNodesChange = useCallback(
+      (nodeChanges: NodeChange[]) => {
+        setNodes((nodes) => applyNodeChanges(nodeChanges, nodes))
+      },
+      [setNodes]
+    )
+
+    const onEdgesChange = useCallback(
+      (edgesChange: EdgeChange[]) => {
+        setEdges(edges)
+      },
+      [edges]
+    )
+
+    const onConnect = useCallback(
+      (params: Edge | Connection) => {
+        setEdges((eds) =>
+          addEdge(
+            {
+              ...params,
+              type: "floating",
+              markerEnd: { type: MarkerType.Arrow },
+            },
+            eds
+          )
+        )
+        if (!event.shiftKey) {
+          setAddEdgeMode(false)
+        }
+      },
+      [setEdges, setAddEdgeMode]
+    )
 
     useEffect(() => {
       const resNodes = nodes.map((node) => {
@@ -105,14 +143,14 @@ export namespace Nodes {
               ...node.data,
               addEdgeMode: addEdgeMode,
             },
-          };
+          }
         }
-        return node;
-      });
+        return node
+      })
       if (JSON.stringify(resNodes) !== JSON.stringify(nodes)) {
-        setNodes(resNodes);
+        setNodes(resNodes)
       }
-    }, [nodes, addEdgeMode]);
+    }, [nodes, addEdgeMode])
 
     return {
       nodes,
@@ -125,7 +163,7 @@ export namespace Nodes {
       onNodesChange,
       onEdgesChange,
       addEdgeMode,
-      setAddEdgeMode
-    };
+      setAddEdgeMode,
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/components/Editor/OptionBar/Class.tsx b/components/Editor/OptionBar/Class.tsx
index e09cb2b..088490c 100644
--- a/components/Editor/OptionBar/Class.tsx
+++ b/components/Editor/OptionBar/Class.tsx
@@ -28,7 +28,6 @@ export function ClassOptions({ node, editNode }: ClassOptionsProps) {
   return (
     <>
       <div className="mb-1 flex flex-row items-center justify-between">
-        {/* <h1 className="text-2xl font-extrabold dark:text-white">{name}</h1> */}
         <input
           className="w-[150px] -translate-x-1 rounded bg-transparent p-1 text-left text-xl font-semibold outline-none duration-100 hover:bg-slate-50 focus:bg-slate-50 focus:outline-none dark:text-white dark:hover:bg-neutral-900 dark:focus:bg-neutral-900"
           placeholder="Nom"
@@ -92,6 +91,7 @@ export function ClassOptions({ node, editNode }: ClassOptionsProps) {
             setAttributes(newAttributes);
           }}
         />
+        <span>:</span>
         <input
           className="w-[70px] rounded bg-transparent p-1 text-left outline-none duration-100 hover:bg-slate-50 focus:bg-slate-50 focus:outline-none dark:text-white dark:hover:bg-neutral-900 dark:focus:bg-neutral-900"
           placeholder="Type"
@@ -129,6 +129,7 @@ export function ClassOptions({ node, editNode }: ClassOptionsProps) {
             setMethods(newMethods);
           }}
         />
+        <span>:</span>
         <input
           className="w-[70px] rounded bg-transparent p-1 text-left outline-none duration-100 hover:bg-slate-50 focus:bg-slate-50 focus:outline-none dark:text-white dark:hover:bg-neutral-900 dark:focus:bg-neutral-900"
           placeholder="Return"