diff --git a/src/Components/Editor/Editor.tsx b/src/Components/Editor/Editor.tsx
index cf9d75a..49b704d 100644
--- a/src/Components/Editor/Editor.tsx
+++ b/src/Components/Editor/Editor.tsx
@@ -38,6 +38,7 @@ function InitActions(
     'elements-sidebar-row',
     [{
       text: 'Delete',
+      title: 'Delete the container',
       action: (target: HTMLElement) => {
         const id = target.id;
         const newHistory = DeleteContainer(
@@ -53,6 +54,7 @@ function InitActions(
     'symbols-sidebar-row',
     [{
       text: 'Delete',
+      title: 'Delete the container',
       action: (target: HTMLElement) => {
         const id = target.id;
         const newHistory = DeleteSymbol(
@@ -83,6 +85,7 @@ function InitActions(
       const currentState = GetCurrentHistoryState(history, historyCurrentStep);
       const newAction: IMenuAction = {
         text: action.Label,
+        title: action.Description,
         action: GetAction(
           action,
           currentState,
@@ -320,7 +323,7 @@ export function Editor(props: IEditorProps): JSX.Element {
       <Menu
         getListener={() => editorRef.current}
         actions={menuActions}
-        className="z-30 transition-opacity rounded bg-slate-200 py-1 drop-shadow-xl"
+        className="z-30 transition-opacity rounded bg-slate-200 drop-shadow-xl"
       />
     </div>
   );
diff --git a/src/Components/Menu/Menu.tsx b/src/Components/Menu/Menu.tsx
index cd92f5c..0b35dd6 100644
--- a/src/Components/Menu/Menu.tsx
+++ b/src/Components/Menu/Menu.tsx
@@ -1,3 +1,4 @@
+import useSize from '@react-hook/size';
 import * as React from 'react';
 import { IPoint } from '../../Interfaces/IPoint';
 import { MenuItem } from './MenuItem';
@@ -12,6 +13,9 @@ export interface IMenuAction {
   /** displayed  */
   text: string
 
+  /** title to show on hover */
+  title?: string
+
   /** function to be called on button click */
   action: (target: HTMLElement) => void
 }
@@ -60,6 +64,9 @@ function UseMouseEvents(
   });
 }
 
+const MENU_WIDTH_CLASS = 'w-52';
+const MENU_VERTICAL_PADDING_CLASS = 'py-1';
+
 export function Menu(props: IMenuProps): JSX.Element {
   const [isOpen, setIsOpen] = React.useState(false);
   const [contextMenuPosition, setContextMenuPosition] = React.useState<IPoint>({
@@ -67,6 +74,8 @@ export function Menu(props: IMenuProps): JSX.Element {
     y: 0
   });
   const [target, setTarget] = React.useState<HTMLElement>();
+  const menuRef = React.useRef<HTMLDivElement>(null);
+  const [menuWidth, menuHeight] = useSize(menuRef);
 
   UseMouseEvents(
     props.getListener,
@@ -89,21 +98,26 @@ export function Menu(props: IMenuProps): JSX.Element {
       actions.forEach((action, index) => {
         children.push(<MenuItem
           key={`contextmenu-item-${count}-${index}`}
-          className="contextmenu-item"
+          className={'contextmenu-item'}
           text={action.text}
+          title={action.title}
           onClick={() => action.action(target)} />);
       });
     };
   }
 
-  // TODO: Fix css
-  const visible = isOpen ? 'visible opacity-1' : 'invisible opacity-0';
+  const visible = isOpen && children.length > 0 ? 'visible opacity-1' : 'invisible opacity-0';
+  const isOutOfBoundHorizontally = contextMenuPosition.x + menuWidth > window.innerWidth;
+  const isOutOfBoundVertically = contextMenuPosition.y + menuHeight > window.innerHeight;
+  const finalHorizontalPosition = isOutOfBoundHorizontally ? contextMenuPosition.x - menuWidth : contextMenuPosition.x;
+  const finalVerticalPosition = isOutOfBoundVertically ? contextMenuPosition.y - menuWidth : contextMenuPosition.y;
   return (
     <div
-      className={`fixed ${props.className ?? ''} ${visible}`}
+      ref={menuRef}
+      className={`fixed context-menu ${MENU_VERTICAL_PADDING_CLASS} ${MENU_WIDTH_CLASS} ${props.className ?? ''} ${visible}`}
       style={{
-        left: contextMenuPosition.x,
-        top: contextMenuPosition.y
+        left: finalHorizontalPosition,
+        top: finalVerticalPosition
       }}>
       { children }
     </div>
diff --git a/src/Components/Menu/MenuItem.tsx b/src/Components/Menu/MenuItem.tsx
index 062ff56..9995572 100644
--- a/src/Components/Menu/MenuItem.tsx
+++ b/src/Components/Menu/MenuItem.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 interface IMenuItemProps {
   className?: string
   text: string
+  title?: string
   onClick: () => void
 }
 
@@ -10,6 +11,7 @@ export function MenuItem(props: IMenuItemProps): JSX.Element {
   return (
     <button type="button"
       className={props.className}
+      title={props.title}
       onClick={() => props.onClick()}>{props.text}
     </button>
   );
diff --git a/src/index.scss b/src/index.scss
index 41c4b9c..ce71f6b 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -109,8 +109,12 @@
     transition-all duration-100 scale-0 origin-left
   }
 
+  .contextmenu {
+    @apply grid grid-cols-1 gap-0
+  }
+
   .contextmenu-item {
-    @apply px-2 py-1 hover:bg-slate-300 text-left
+    @apply px-2 py-1 hover:bg-slate-300 text-left w-full
   }
 
   .input-group {