diff --git a/src/less/settings.less b/src/less/settings.less
index 93dc97f..8ecfd21 100644
--- a/src/less/settings.less
+++ b/src/less/settings.less
@@ -41,7 +41,7 @@
 
   input[type="text"] {
     width: 100%;
-    font-family: "Pixelated MS Sans Serif", Arial;
+    font-family: @win-font;
   }
 
   input[type="text"]:read-only {
diff --git a/src/renderer/card-settings.tsx b/src/renderer/card-settings.tsx
index 8f172b7..8ce85a1 100644
--- a/src/renderer/card-settings.tsx
+++ b/src/renderer/card-settings.tsx
@@ -5,12 +5,10 @@ import { resetState } from "./utils/reset-state";
 interface CardSettingsProps {
   bootFromScratch: () => void;
   setFloppy: (file: File) => void;
-  setCdrom: (cdrom: File) => void;
   setSmbSharePath: (path: string) => void;
   pickFolder: () => Promise<string | null>;
-  navigate: (to: string) => void;
+  navigate: (to: "start" | "settings") => void;
   floppy?: File;
-  cdrom?: File;
   smbSharePath: string;
 }
 
@@ -29,7 +27,6 @@ export class CardSettings extends React.Component<
     super(props);
 
     this.onChangeFloppy = this.onChangeFloppy.bind(this);
-    this.onChangeCdrom = this.onChangeCdrom.bind(this);
     this.onResetState = this.onResetState.bind(this);
 
     this.state = {
@@ -206,19 +203,6 @@ export class CardSettings extends React.Component<
     }
   }
 
-  private onChangeCdrom(event: React.ChangeEvent<HTMLInputElement>) {
-    const cdromFile =
-      event.target.files && event.target.files.length > 0
-        ? event.target.files[0]
-        : null;
-
-    if (cdromFile) {
-      this.props.setCdrom(cdromFile);
-    } else {
-      console.log(`Cdrom: Input changed but no file selected`);
-    }
-  }
-
   private async onResetState() {
     await resetState();
     this.setState({ isStateReset: true });
diff --git a/src/renderer/card-start.tsx b/src/renderer/card-start.tsx
index 896c865..061c49d 100644
--- a/src/renderer/card-start.tsx
+++ b/src/renderer/card-start.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 
 export interface CardStartProps {
   startEmulator: () => void;
-  navigate: (to: string) => void;
+  navigate: (to: "start" | "settings") => void;
 }
 
 const TIPS = [
diff --git a/src/renderer/emulator.tsx b/src/renderer/emulator.tsx
index 24a1e18..cee325e 100644
--- a/src/renderer/emulator.tsx
+++ b/src/renderer/emulator.tsx
@@ -210,14 +210,14 @@ export class Emulator extends React.Component<{}, EmulatorState> {
    * 🤡
    */
   public renderUI() {
-    const { isRunning, currentUiCard, floppyFile, cdromFile } = this.state;
+    const { isRunning, currentUiCard, floppyFile } = this.state;
 
     if (isRunning) {
       return null;
     }
 
-    const navigate = (target: string) =>
-      this.setState({ currentUiCard: target as "start" | "settings" });
+    const navigate = (currentUiCard: "start" | "settings") =>
+      this.setState({ currentUiCard });
 
     let card;
 
@@ -225,7 +225,6 @@ export class Emulator extends React.Component<{}, EmulatorState> {
       card = (
         <CardSettings
           setFloppy={(floppyFile) => this.setState({ floppyFile })}
-          setCdrom={(cdromFile) => this.setState({ cdromFile })}
           setSmbSharePath={(smbSharePath) => {
             this.setState({ smbSharePath });
             ipcRenderer.invoke(IPC_COMMANDS.SET_SMB_SHARE_PATH, smbSharePath);
@@ -233,7 +232,6 @@ export class Emulator extends React.Component<{}, EmulatorState> {
           pickFolder={() => ipcRenderer.invoke(IPC_COMMANDS.PICK_FOLDER)}
           bootFromScratch={this.bootFromScratch}
           floppy={floppyFile}
-          cdrom={cdromFile}
           smbSharePath={this.state.smbSharePath}
           navigate={navigate}
         />