diff --git a/frontend/app/globals.css b/frontend/app/globals.css
index e48e9aa..5d2838d 100644
--- a/frontend/app/globals.css
+++ b/frontend/app/globals.css
@@ -97,4 +97,13 @@
 
 .gradient-project-card-bg > div:hover {
   background: radial-gradient(circle at bottom right, #312e81 -75%, hsl(0 0% 3.9%) 60%); /* violet 900 -> bg */
+}
+
+.inline-decoration::after {
+  content: 'Generate ⌘G';
+  color: #525252;
+  border: 1px solid #525252;
+  padding: 2px 4px;
+  border-radius: 4px;
+  margin-left: 56px;
 }
\ No newline at end of file
diff --git a/frontend/components/editor/index.tsx b/frontend/components/editor/index.tsx
index 45b3c18..35e3750 100644
--- a/frontend/components/editor/index.tsx
+++ b/frontend/components/editor/index.tsx
@@ -44,10 +44,13 @@ export default function CodeEditor({
   const [activeFile, setActiveFile] = useState<string | null>(null)
   const [tabs, setTabs] = useState<TTab[]>([])
   const [activeId, setActiveId] = useState<string | null>(null)
-  const [terminals, setTerminals] = useState<string[]>([])
-  const [showGenerate, setShowGenerate] = useState(false)
-  const [generateId, setGenerateId] = useState<string>("")
   const [cursorLine, setCursorLine] = useState(0)
+  const [generate, setGenerate] = useState({ show: false, id: "" })
+  const [decorations, setDecorations] = useState<{
+    options: monaco.editor.IModelDeltaDecoration[]
+    instance: monaco.editor.IEditorDecorationsCollection | undefined
+  }>({ options: [], instance: undefined })
+  const [terminals, setTerminals] = useState<string[]>([])
 
   const clerk = useClerk()
 
@@ -70,7 +73,31 @@ export default function CodeEditor({
     monacoRef.current = monaco
 
     editor.onDidChangeCursorPosition((e) => {
-      setCursorLine(e.position.lineNumber)
+      const { column, lineNumber } = e.position
+      if (lineNumber === cursorLine) return
+      setCursorLine(lineNumber)
+
+      const model = editor.getModel()
+      const endColumn = model?.getLineContent(lineNumber).length || 0
+
+      setDecorations((prev) => {
+        return {
+          ...prev,
+          options: [
+            {
+              range: new monaco.Range(
+                lineNumber,
+                column,
+                lineNumber,
+                endColumn
+              ),
+              options: {
+                afterContentClassName: "inline-decoration",
+              },
+            },
+          ],
+        }
+      })
     })
 
     editor.addAction({
@@ -79,12 +106,16 @@ export default function CodeEditor({
       keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyG],
       precondition:
         "editorTextFocus && !suggestWidgetVisible && !renameInputVisible && !inSnippetMode && !quickFixWidgetVisible",
-      run: () => setShowGenerate((prev) => !prev),
+      run: () => {
+        setGenerate((prev) => {
+          return { ...prev, show: !prev.show }
+        })
+      },
     })
   }
 
   useEffect(() => {
-    if (showGenerate) {
+    if (generate.show) {
       editorRef.current?.changeViewZones(function (changeAccessor) {
         if (!generateRef.current) return
         const id = changeAccessor.addZone({
@@ -92,16 +123,41 @@ export default function CodeEditor({
           heightInLines: 3,
           domNode: generateRef.current,
         })
-        setGenerateId(id)
+        setGenerate((prev) => {
+          return { ...prev, id }
+        })
       })
     } else {
       editorRef.current?.changeViewZones(function (changeAccessor) {
         if (!generateRef.current) return
-        changeAccessor.removeZone(generateId)
-        setGenerateId("")
+        changeAccessor.removeZone(generate.id)
+        setGenerate((prev) => {
+          return { ...prev, id: "" }
+        })
       })
     }
-  }, [showGenerate])
+  }, [generate.show])
+
+  useEffect(() => {
+    if (decorations.options.length === 0) return
+
+    if (decorations.instance) {
+      console.log("setting decorations")
+      // decorations.instance.clear()
+      decorations.instance.set(decorations.options)
+    } else {
+      console.log("creating decorations")
+      const instance = editorRef.current?.createDecorationsCollection()
+      instance?.set(decorations.options)
+
+      setDecorations((prev) => {
+        return {
+          ...prev,
+          instance,
+        }
+      })
+    }
+  }, [decorations.options])
 
   const socket = io(
     `http://localhost:4000?userId=${userData.id}&sandboxId=${sandboxId}`
@@ -241,7 +297,7 @@ export default function CodeEditor({
   return (
     <>
       <div className="bg-blue-500" ref={generateRef}>
-        {showGenerate ? "HELLO" : null}
+        {generate.show ? "HELLO" : null}
       </div>
       <Sidebar
         files={files}
@@ -296,7 +352,6 @@ export default function CodeEditor({
             ) : clerk.loaded ? (
               <Editor
                 height="100%"
-                // defaultLanguage="typescript"
                 language={editorLanguage}
                 beforeMount={handleEditorWillMount}
                 onMount={handleEditorMount}
@@ -317,6 +372,7 @@ export default function CodeEditor({
                   },
                   scrollBeyondLastLine: false,
                   fixedOverflowWidgets: true,
+                  fontFamily: "var(--font-geist-mono)",
                 }}
                 theme="vs-dark"
                 value={activeFile ?? ""}
diff --git a/frontend/components/editor/terminal/index.tsx b/frontend/components/editor/terminal/index.tsx
index 8156275..d2aa421 100644
--- a/frontend/components/editor/terminal/index.tsx
+++ b/frontend/components/editor/terminal/index.tsx
@@ -20,6 +20,8 @@ export default function EditorTerminal({ socket }: { socket: Socket }) {
       theme: {
         background: "#262626",
       },
+      fontFamily: "var(--font-geist-mono)",
+      fontSize: 14,
     })
 
     setTerm(terminal)
@@ -71,10 +73,7 @@ export default function EditorTerminal({ socket }: { socket: Socket }) {
   }, [term, terminalRef.current])
 
   return (
-    <div
-      ref={terminalRef}
-      className="w-full font-mono text-sm h-full text-left"
-    >
+    <div ref={terminalRef} className="w-full h-full text-left">
       {term === null ? (
         <div className="flex items-center text-muted-foreground p-2">
           <Loader2 className="animate-spin mr-2 h-4 w-4" />