diff --git a/components/DeployEditor.tsx b/components/DeployEditor.tsx
index cbbc873..4a4f22c 100644
--- a/components/DeployEditor.tsx
+++ b/components/DeployEditor.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useSnapshot, ref } from "valtio";
+import { useSnapshot } from "valtio";
 
 import { useTheme } from "next-themes";
 import { useRouter } from "next/router";
diff --git a/components/HooksEditor.tsx b/components/HooksEditor.tsx
index be0f2ce..6267a95 100644
--- a/components/HooksEditor.tsx
+++ b/components/HooksEditor.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useRef } from "react";
 import { useSnapshot, ref } from "valtio";
-import Editor from "@monaco-editor/react";
 import type monaco from "monaco-editor";
 import { ArrowBendLeftUp } from "phosphor-react";
 import { useTheme } from "next-themes";
@@ -8,8 +7,6 @@ import { useRouter } from "next/router";
 
 import Box from "./Box";
 import Container from "./Container";
-import dark from "../theme/editor/amy.json";
-import light from "../theme/editor/xcode_default.json";
 import { saveFile } from "../state/actions";
 import { apiHeaderFiles } from "../state/constants";
 import state from "../state";
@@ -22,10 +19,11 @@ import { listen } from "@codingame/monaco-jsonrpc";
 import ReconnectingWebSocket from "reconnecting-websocket";
 
 import docs from "../xrpl-hooks-docs/docs";
+import Monaco from "./Monaco";
 
 const validateWritability = (editor: monaco.editor.IStandaloneCodeEditor) => {
   const currPath = editor.getModel()?.uri.path;
-  if (apiHeaderFiles.find((h) => currPath?.endsWith(h))) {
+  if (apiHeaderFiles.find(h => currPath?.endsWith(h))) {
     editor.updateOptions({ readOnly: true });
   } else {
     editor.updateOptions({ readOnly: false });
@@ -42,7 +40,7 @@ const setMarkers = (monacoE: typeof monaco) => {
     .getModelMarkers({})
     // Filter out the markers that are hooks specific
     .filter(
-      (marker) =>
+      marker =>
         typeof marker?.code === "string" &&
         // Take only markers that starts with "hooks-"
         marker?.code?.includes("hooks-")
@@ -56,16 +54,16 @@ const setMarkers = (monacoE: typeof monaco) => {
   // Add decoration (aka extra hoverMessages) to markers in the
   // exact same range (location) where the markers are
   const models = monacoE.editor.getModels();
-  models.forEach((model) => {
+  models.forEach(model => {
     decorations[model.id] = model?.deltaDecorations(
       decorations?.[model.id] || [],
       markers
-        .filter((marker) =>
+        .filter(marker =>
           marker?.resource.path
             .split("/")
             .includes(`${state.files?.[state.active]?.name}`)
         )
-        .map((marker) => ({
+        .map(marker => ({
           range: new monacoE.Range(
             marker.startLineNumber,
             marker.startColumn,
@@ -113,6 +111,8 @@ const HooksEditor = () => {
       setMarkers(monacoRef.current);
     }
   }, [snap.active]);
+
+  const file = snap.files[snap.active];
   return (
     <Box
       css={{
@@ -127,16 +127,15 @@ const HooksEditor = () => {
     >
       <EditorNavigation />
       {snap.files.length > 0 && router.isReady ? (
-        <Editor
-          className="hooks-editor"
+        <Monaco
           keepCurrentModel
-          defaultLanguage={snap.files?.[snap.active]?.language}
-          language={snap.files?.[snap.active]?.language}
-          path={`file:///work/c/${snap.files?.[snap.active]?.name}`}
-          defaultValue={snap.files?.[snap.active]?.content}
-          beforeMount={(monaco) => {
+          defaultLanguage={file?.language}
+          language={file?.language}
+          path={`file:///work/c/${file?.name}`}
+          defaultValue={file?.content}
+          beforeMount={monaco => {
             if (!snap.editorCtx) {
-              snap.files.forEach((file) =>
+              snap.files.forEach(file =>
                 monaco.editor.createModel(
                   file.content,
                   file.language,
@@ -161,7 +160,7 @@ const HooksEditor = () => {
               // listen when the web socket is opened
               listen({
                 webSocket: webSocket as WebSocket,
-                onConnection: (connection) => {
+                onConnection: connection => {
                   // create and start the language client
                   const languageClient = createLanguageClient(connection);
                   const disposable = languageClient.start();
@@ -177,7 +176,6 @@ const HooksEditor = () => {
               });
             }
 
-            // // hook editor to global state
             // editor.updateOptions({
             //   minimap: {
             //     enabled: false,
@@ -186,10 +184,6 @@ const HooksEditor = () => {
             // });
             if (!state.editorCtx) {
               state.editorCtx = ref(monaco.editor);
-              // @ts-expect-error
-              monaco.editor.defineTheme("dark", dark);
-              // @ts-expect-error
-              monaco.editor.defineTheme("light", light);
             }
           }}
           onMount={(editor, monaco) => {
@@ -217,13 +211,13 @@ const HooksEditor = () => {
             });
 
             // Hacky way to hide Peek menu
-            editor.onContextMenu((e) => {
+            editor.onContextMenu(e => {
               const host =
                 document.querySelector<HTMLElement>(".shadow-root-host");
 
               const contextMenuItems =
                 host?.shadowRoot?.querySelectorAll("li.action-item");
-              contextMenuItems?.forEach((k) => {
+              contextMenuItems?.forEach(k => {
                 // If menu item contains "Peek" lets hide it
                 if (k.querySelector(".action-label")?.textContent === "Peek") {
                   // @ts-expect-error
diff --git a/components/Monaco.tsx b/components/Monaco.tsx
index 691fa92..a0b03d7 100644
--- a/components/Monaco.tsx
+++ b/components/Monaco.tsx
@@ -62,7 +62,9 @@ const Monaco: FC<MonacoProps> = ({
         {...rest}
       />
       {overlay && (
-        <Flex css={{ position: "absolute", bottom: 0, right: 0 }}>
+        <Flex
+          css={{ position: "absolute", bottom: 0, right: 0, width: "100%" }}
+        >
           {overlay}
         </Flex>
       )}
diff --git a/components/Transaction/json.tsx b/components/Transaction/json.tsx
index 6615d8f..efcdb3e 100644
--- a/components/Transaction/json.tsx
+++ b/components/Transaction/json.tsx
@@ -203,7 +203,7 @@ export const TxJson: FC<JsonProps> = ({
           <Flex
             row
             align="center"
-            css={{ fontSize: "$xs", color: "$textMuted" }}
+            css={{ fontSize: "$xs", color: "$textMuted", ml: 'auto' }}
           >
             <Text muted small>
               This file has unsaved changes.
diff --git a/state/actions/compileCode.ts b/state/actions/compileCode.ts
index e77800d..5fa72db 100644
--- a/state/actions/compileCode.ts
+++ b/state/actions/compileCode.ts
@@ -20,7 +20,7 @@ export const compileCode = async (activeId: number) => {
   }
   // Bail out if we're already compiling
   if (state.compiling) {
-    // if compiling is ongoing return
+    // if compiling is ongoing return // TODO Inform user about it.
     return;
   }
   // Set loading state to true