diff --git a/public/index.html b/public/index.html
index 7cd131c..a52b6af 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css" crossorigin="anonymous">
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/src/components/ControlPanel.jsx b/src/components/ControlPanel.jsx
index 1d24507..680f1b5 100644
--- a/src/components/ControlPanel.jsx
+++ b/src/components/ControlPanel.jsx
@@ -62,7 +62,7 @@ import { Editor } from "@monaco-editor/react";
 import { db } from "../data/db";
 import { useLiveQuery } from "dexie-react-hooks";
 
-export default function ControlPanel(props) {
+export default function ControlPanel({ diagramId, setDiagramId }) {
   const MODAL = {
     NONE: 0,
     IMG: 1,
@@ -70,6 +70,7 @@ export default function ControlPanel(props) {
     IMPORT: 3,
     RENAME: 4,
     OPEN: 5,
+    SAVEAS: 6,
   };
   const STATUS = {
     NONE: 0,
@@ -80,8 +81,9 @@ export default function ControlPanel(props) {
   const diagrams = useLiveQuery(() => db.diagrams.toArray());
   const [visible, setVisible] = useState(MODAL.NONE);
   const [title, setTitle] = useState("Untitled Diagram");
-  const [selectedDiagramId, setSelectedDiagramId] = useState(0);
   const [prevTitle, setPrevTitle] = useState(title);
+  const [saveAsTitle, setSaveAsTitle] = useState(title);
+  const [selectedDiagramId, setSelectedDiagramId] = useState(0);
   const [showEditName, setShowEditName] = useState(false);
   const [exportData, setExportData] = useState({
     data: null,
@@ -675,16 +677,20 @@ export default function ControlPanel(props) {
     });
   };
   const open = () => setVisible(MODAL.OPEN);
-  const loadDiagram = (id) => {
-    db.diagrams
+  const saveDiagramAs = () => setVisible(MODAL.SAVEAS);
+  const loadDiagram = async (id) => {
+    await db.diagrams
       .get(id)
       .then((diagram) => {
         if (diagram) {
+          setDiagramId(diagram.id);
           setTitle(diagram.name);
           setTables(diagram.tables);
           setRelationships(diagram.references);
           setAreas(diagram.areas);
           setNotes(diagram.notes);
+          setUndoStack([]);
+          setRedoStack([]);
         } else {
           Toast.error("Oops! Something went wrong.");
         }
@@ -711,7 +717,8 @@ export default function ControlPanel(props) {
         shortcut: "Ctrl+S",
       },
       "Save as": {
-        function: () => {},
+        function: saveDiagramAs,
+        shortcut: "Ctrl+Shift+S",
       },
       Share: {
         function: () => {},
@@ -722,6 +729,23 @@ export default function ControlPanel(props) {
           setPrevTitle(title);
         },
       },
+      "Delete diagram": {
+        function: async () => {
+          await db.diagrams
+            .delete(diagramId)
+            .then(() => {
+              setDiagramId(0);
+              setTitle("Untitled diagram");
+              setTables([]);
+              setRelationships([]);
+              setAreas([]);
+              setNotes([]);
+              setUndoStack([]);
+              setRedoStack([]);
+            })
+            .catch((e) => Toast.error("Oops! Something went wrong."));
+        },
+      },
       Import: {
         function: fileImport,
         shortcut: "Ctrl+I",
@@ -876,7 +900,7 @@ export default function ControlPanel(props) {
       Properties: {
         function: () => {},
       },
-      Close: {
+      Exit: {
         function: () => {},
       },
     },
@@ -1052,6 +1076,9 @@ export default function ControlPanel(props) {
   useHotkeys("ctrl+shift+f, meta+shift+f", viewFieldSummary, {
     preventDefault: true,
   });
+  useHotkeys("ctrl+shift+s, meta+shift+s", saveDiagramAs, {
+    preventDefault: true,
+  });
   useHotkeys("ctrl+alt+c, meta+alt+c", copyAsImage, { preventDefault: true });
   useHotkeys("ctrl+r, meta+r", resetView, { preventDefault: true });
   useHotkeys("ctrl+h, meta+h", () => window.open("/shortcuts", "_blank"), {
@@ -1071,6 +1098,8 @@ export default function ControlPanel(props) {
         return "Rename diagram";
       case MODAL.OPEN:
         return "Open diagram";
+      case MODAL.SAVEAS:
+        return "Save as";
       default:
         return "";
     }
@@ -1087,8 +1116,10 @@ export default function ControlPanel(props) {
         return "Rename";
       case MODAL.OPEN:
         return "Open";
+      case MODAL.SAVEAS:
+        return "Save as";
       default:
-        return "";
+        return "Confirm";
     }
   };
 
@@ -1121,6 +1152,18 @@ export default function ControlPanel(props) {
         loadDiagram(selectedDiagramId);
         setVisible(MODAL.NONE);
         return;
+      case MODAL.SAVEAS:
+        db.diagrams.add({
+          name: saveAsTitle,
+          lastModified: new Date(),
+          tables: tables,
+          references: relationships,
+          types: types,
+          notes: notes,
+          areas: areas,
+        });
+        setVisible(MODAL.NONE);
+        return;
       default:
         setVisible(MODAL.NONE);
         return;
@@ -1247,6 +1290,15 @@ export default function ControlPanel(props) {
         />
       );
     }
+    if (visible === MODAL.SAVEAS) {
+      return (
+        <Input
+          placeholder="Diagram name"
+          value={saveAsTitle}
+          onChange={(v) => setSaveAsTitle(v)}
+        />
+      );
+    }
     if (visible === MODAL.OPEN) {
       return (
         <div>
@@ -1382,7 +1434,8 @@ export default function ControlPanel(props) {
               (error.type === STATUS.ERROR || !data)) ||
             ((visible === MODAL.IMG || visible === MODAL.CODE) &&
               !exportData.data) ||
-            (visible === MODAL.OPEN && selectedDiagramId === 0),
+            (visible === MODAL.RENAME && title === "") ||
+            (visible === MODAL.SAVEAS && saveAsTitle === ""),
         }}
         cancelText="Cancel"
         width={600}
diff --git a/src/pages/editor.jsx b/src/pages/editor.jsx
index 74070e3..52c1495 100644
--- a/src/pages/editor.jsx
+++ b/src/pages/editor.jsx
@@ -583,7 +583,7 @@ export default function Editor(props) {
                         }}
                       >
                         <div className="h-[100vh] overflow-hidden theme">
-                          <ControlPanel />
+                          <ControlPanel diagramId={id} setDiagramId={setId}/>
                           <div
                             className={
                               layout.header