diff --git a/src/components/choice/Choice.tsx b/src/components/choice/Choice.tsx
index e1cc591..0f9b3fa 100644
--- a/src/components/choice/Choice.tsx
+++ b/src/components/choice/Choice.tsx
@@ -11,8 +11,8 @@ type ChoiceProps = {
 const Choice = ({ choice, onSelect }: ChoiceProps) => {
     return (
         <>
-            <h2>{choice["choice-name"]}</h2>
-            <div className="d-grid gap-2">
+            <h1>{choice["choice-name"]}</h1>
+            <div className="d-grid gap-3">
                 {choice.choices.map((subChoice) => (
                     <Button
                         style={{ minHeight: "60px" }}
@@ -20,7 +20,7 @@ const Choice = ({ choice, onSelect }: ChoiceProps) => {
                         onClick={() => onSelect(subChoice)}
                     >
                         <>
-                            <h3>{subChoice.name}</h3>
+                            <h2>{subChoice.name}</h2>
 
                             {subChoice.description}
                             {subChoice.erase && (
diff --git a/src/components/installermodal/UploadCustomImageModal.tsx b/src/components/installermodal/UploadCustomImageModal.tsx
new file mode 100644
index 0000000..1c5c0c8
--- /dev/null
+++ b/src/components/installermodal/UploadCustomImageModal.tsx
@@ -0,0 +1,267 @@
+import React, { useContext, useState } from "react";
+import { Spinner } from "..";
+import { Button, Modal } from "react-bootstrap";
+import {
+    ControllerStatus,
+    InstallService,
+    InstallerState
+} from "../../services";
+import { Progress } from "../../panels";
+import { FlashProgress } from "../../services/FlashService";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
+import {
+    faBan,
+    faFile,
+    faFileArrowUp
+} from "@fortawesome/free-solid-svg-icons";
+import BootloaderInfo from "../../panels/bootloaderinfo/BootloaderInfo";
+import Log from "../log/Log";
+import { ControllerServiceContext } from "../../context/ControllerServiceContext";
+
+const initialProgress: FlashProgress = {
+    fileIndex: 0,
+    fileCount: 1,
+    fileName: "",
+    fileProgress: 0
+};
+
+type UploadCustomImageModalProps = {
+    onClose: () => void;
+};
+
+const UploadCustomImageModal = ({ onClose }: UploadCustomImageModalProps) => {
+    const [showLog, setShowLog] = useState<boolean>(false);
+    const controllerService = useContext(ControllerServiceContext);
+    const [state, setState] = useState(InstallerState.SELECT_PACKAGE);
+    const [progress, setProgress] = useState<FlashProgress>(initialProgress);
+    const [errorMessage, setErrorMessage] = useState<string | undefined>();
+    const [log, setLog] = useState("");
+    const [currentFile, setCurrentFile] = useState<File | undefined>();
+    const [currentFileData, setCurrentFileData] = useState<
+        Uint8Array | undefined
+    >();
+
+    const onLogData = (data: string) => {
+        setLog((l) => l + data);
+        console.log(data);
+    };
+
+    const onUpload = async () => {
+        return new Promise((resolve) => {
+            const input = document.createElement("input");
+            input.type = "file";
+            input.multiple = false;
+            input.accept = ".bin";
+
+            // eslint-disable-next-line
+            input.onchange = async (e: any) => {
+                const files = e?.target?.files ?? [];
+                if (files.length === 0) {
+                    resolve(1);
+                }
+
+                for (const file of files) {
+                    setCurrentFile(file);
+                    setCurrentFileData(await getFileData(file));
+                }
+                resolve(1);
+            };
+            input.click();
+        });
+    };
+
+    const getFileData = (file): Promise<Uint8Array> => {
+        return new Promise((resolve) => {
+            console.log("Uploading", file);
+            const reader = new FileReader();
+            reader.onload = (readerEvent) => {
+                const content = readerEvent?.target?.result as ArrayBuffer;
+                if (!content) {
+                    return;
+                }
+
+                resolve(new Uint8Array(Buffer.from(content)));
+            };
+            reader.readAsArrayBuffer(file);
+        });
+    };
+
+    const onInstall = async (fileData: Uint8Array) => {
+        try {
+            await controllerService?.disconnect(false);
+        } catch (_error) {
+            // never mind
+        }
+
+        let hasErrors = false;
+        await InstallService.installImage(
+            controllerService.serialPort,
+            fileData,
+            setProgress,
+            setState,
+            onLogData
+        ).catch((error) => {
+            setErrorMessage(error);
+            setState(InstallerState.ERROR);
+            hasErrors = true;
+        });
+
+        try {
+            const status = await controllerService?.connect();
+            if (status !== ControllerStatus.CONNECTED) {
+                setErrorMessage(
+                    "An error occured while reconnecting, please reboot the controller"
+                );
+                setState(InstallerState.ERROR);
+            }
+
+            if (!hasErrors) {
+                setState(InstallerState.DONE);
+            }
+        } catch (error) {
+            setErrorMessage(error);
+            setState(InstallerState.ERROR);
+        }
+    };
+
+    return (
+        <Modal centered show={true} size="lg">
+            {state === InstallerState.SELECT_PACKAGE && (
+                <>
+                    <Modal.Body>
+                        <h3>Select image</h3>
+                        <p>
+                            Select a <b>firmware.bin</b> file to flash the
+                            controller with.
+                        </p>
+                        {!currentFile && (
+                            <Button onClick={onUpload}>
+                                <FontAwesomeIcon
+                                    icon={faFileArrowUp as IconDefinition}
+                                    style={{ marginRight: "10px" }}
+                                />
+                                Select firmware image
+                            </Button>
+                        )}
+                        {currentFile && (
+                            <>
+                                <p>
+                                    <FontAwesomeIcon
+                                        icon={faFile as IconDefinition}
+                                        style={{ marginRight: "10px" }}
+                                    />
+                                    {currentFile.name}
+                                </p>
+                            </>
+                        )}
+                    </Modal.Body>
+                    <Modal.Footer>
+                        <Button onClick={onClose}>
+                            <>Close</>
+                        </Button>
+                        <Button
+                            disabled={!currentFile}
+                            variant={currentFile ? "success" : "secondary"}
+                            onClick={() => onInstall(currentFileData)}
+                        >
+                            Install
+                        </Button>
+                    </Modal.Footer>
+                </>
+            )}
+            {(state === InstallerState.DOWNLOADING ||
+                state === InstallerState.CHECKING_SIGNATURES) && (
+                <Modal.Body>
+                    <h3>Downloading</h3>
+                    <p>
+                        Downloading package... <Spinner />
+                    </p>
+                    <Log show={showLog} onShow={setShowLog}>
+                        {log}
+                    </Log>
+                </Modal.Body>
+            )}
+
+            {state === InstallerState.ENTER_FLASH_MODE && (
+                <Modal.Body>
+                    <BootloaderInfo />
+                    <Log show={showLog} onShow={setShowLog}>
+                        {log}
+                    </Log>
+                </Modal.Body>
+            )}
+
+            {state === InstallerState.FLASHING && (
+                <Modal.Body>
+                    <Progress progress={progress} status={state} />
+                    <Log show={showLog} onShow={setShowLog}>
+                        {log}
+                    </Log>
+                </Modal.Body>
+            )}
+            {state === InstallerState.RESTARTING && (
+                <Modal.Body>
+                    <h3>Restarting</h3>
+                    <p>
+                        Waiting for controller restart... <Spinner />
+                    </p>
+                    <Log show={showLog} onShow={setShowLog}>
+                        {log}
+                    </Log>
+                </Modal.Body>
+            )}
+            {state === InstallerState.UPLOADING_FILES && (
+                <Modal.Body>
+                    <h3>Uploading files</h3>
+                    <p>
+                        Uploading files... <Spinner />
+                    </p>
+                    <Log show={showLog} onShow={setShowLog}>
+                        {log}
+                    </Log>
+                </Modal.Body>
+            )}
+            {state === InstallerState.DONE && (
+                <>
+                    <Modal.Body>
+                        <h3>Done</h3>
+                        <p>
+                            The controller has been successfully installed and
+                            is ready to be used.
+                        </p>
+                        <Log show={showLog} onShow={setShowLog}>
+                            {log}
+                        </Log>
+                    </Modal.Body>
+                    <Modal.Footer>
+                        <Button onClick={onClose}>
+                            <>Continue</>
+                        </Button>
+                    </Modal.Footer>
+                </>
+            )}
+            {state === InstallerState.ERROR && (
+                <>
+                    <Modal.Body>
+                        <h3>Error!</h3>
+                        <div className="alert alert-danger">
+                            <FontAwesomeIcon icon={faBan as IconDefinition} />{" "}
+                            {errorMessage}
+                        </div>
+                        <Log show={showLog} onShow={setShowLog}>
+                            {log}
+                        </Log>
+                    </Modal.Body>
+                    <Modal.Footer>
+                        <Button onClick={onClose}>
+                            <>Close</>
+                        </Button>
+                    </Modal.Footer>
+                </>
+            )}
+        </Modal>
+    );
+};
+
+export default UploadCustomImageModal;
diff --git a/src/panels/firmware/Firmware.scss b/src/panels/firmware/Firmware.scss
index 55aca06..fdd7f87 100644
--- a/src/panels/firmware/Firmware.scss
+++ b/src/panels/firmware/Firmware.scss
@@ -1,11 +1,9 @@
 .firmware-component {
-    .button {
-        margin-right: 20px;
-    }
+    
 
     .card {
-        margin-bottom: 30px;
-        margin-top: 30px;
+        margin-bottom: 25px;
+        margin-top: 25px;
         background-color: #eee !important;
     }
 
diff --git a/src/panels/firmware/Firmware.tsx b/src/panels/firmware/Firmware.tsx
index 7c34aab..316fc80 100644
--- a/src/panels/firmware/Firmware.tsx
+++ b/src/panels/firmware/Firmware.tsx
@@ -12,8 +12,19 @@ import Choice from "../../components/choice";
 import { Markdown } from "../../components/markdown/Markdown";
 import PageTitle from "../../components/pagetitle/PageTitle";
 import FirmwareBreadCrumbList from "./FirmwareBreadcrumbList";
-import { Col, FormCheck } from "react-bootstrap";
+import {
+    Col,
+    FormCheck,
+    Row,
+    Form,
+    DropdownButton,
+    Dropdown
+} from "react-bootstrap";
 import { useLocalStorage } from "../../hooks/useLocalStorage";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
+import { faFileArrowUp, faSliders } from "@fortawesome/free-solid-svg-icons";
+import UploadCustomImageModal from "../../components/installermodal/UploadCustomImageModal";
 
 type Props = {
     onInstall: (
@@ -28,6 +39,7 @@ const Firmware = ({ onInstall }: Props) => {
         []
     );
     const [releases, setReleases] = useState<GithubRelease[]>([]);
+    const [uploadCustomImage, setUploadCustomImage] = useState<boolean>(false);
     const [selectedRelease, setSelectedRelease] = useState<GithubRelease>();
     const [errorMessage, setErrorMessage] = useState<string | undefined>();
     const [releaseManifest, setReleaseManifest] = useState<
@@ -97,6 +109,13 @@ const Firmware = ({ onInstall }: Props) => {
             {errorMessage && (
                 <div className="alert alert-danger">{errorMessage}</div>
             )}
+
+            {uploadCustomImage && (
+                <UploadCustomImageModal
+                    onClose={() => setUploadCustomImage(false)}
+                />
+            )}
+
             {!errorMessage && (
                 <>
                     <PageTitle>Install</PageTitle>
@@ -105,23 +124,59 @@ const Firmware = ({ onInstall }: Props) => {
                         controller.
                     </p>
 
-                    <select
-                        className="form-select form-select-lg mb-3"
-                        onChange={(event) => chooseFirmware(event.target.value)}
-                    >
-                        {!releases?.length && <option>Loading...</option>}
-                        {releases.map((release) => (
-                            <option key={release.id} value={release.id}>
-                                {release.name}
-                            </option>
-                        ))}
-                    </select>
-                    <FormCheck
-                        type="switch"
-                        label="Show pre-releases"
-                        checked={Boolean(showPrerelease)}
-                        onChange={() => setShowPrerelease((value) => !value)}
-                    />
+                    <Row>
+                        <Col>
+                            <Form.Select
+                                size="lg"
+                                onChange={(event) =>
+                                    chooseFirmware(event.target.value)
+                                }
+                            >
+                                {!releases?.length && (
+                                    <option>Loading...</option>
+                                )}
+                                {releases.map((release) => (
+                                    <option key={release.id} value={release.id}>
+                                        {release.name}
+                                    </option>
+                                ))}
+                            </Form.Select>
+                        </Col>
+                        <Col sm="4" md="3" lg="2">
+                            <DropdownButton
+                                className={"d-grid"}
+                                size="lg"
+                                title={
+                                    <FontAwesomeIcon
+                                        icon={faSliders as IconDefinition}
+                                    />
+                                }
+                            >
+                                <Dropdown.Item>
+                                    {" "}
+                                    <FormCheck
+                                        type="switch"
+                                        label="Show pre-releases"
+                                        checked={Boolean(showPrerelease)}
+                                        onChange={() =>
+                                            setShowPrerelease(
+                                                (!showPrerelease).toString()
+                                            )
+                                        }
+                                    />
+                                </Dropdown.Item>
+                                <Dropdown.Divider />
+                                <Dropdown.Item
+                                    onClick={() => setUploadCustomImage(true)}
+                                >
+                                    <FontAwesomeIcon
+                                        icon={faFileArrowUp as IconDefinition}
+                                    />
+                                    Upload custom image...
+                                </Dropdown.Item>
+                            </DropdownButton>
+                        </Col>
+                    </Row>
                 </>
             )}
 
@@ -132,19 +187,28 @@ const Firmware = ({ onInstall }: Props) => {
             )}
             {!isLoading && selectedRelease && (
                 <>
-                    {choice && releaseManifest && !choice.images && (
-                        <>
-                            <Card className="text-bg-light card">
-                                <FirmwareBreadCrumbList
-                                    selectedChoices={selectedChoices}
-                                    setSelectedChoices={setSelectedChoices}
-                                />
-                                <Choice choice={choice} onSelect={onSelect} />
-                            </Card>
-                        </>
-                    )}
+                    <Row>
+                        <Col sm="12" md="12" lg="6">
+                            {choice && releaseManifest && !choice.images && (
+                                <Card>
+                                    <FirmwareBreadCrumbList
+                                        selectedChoices={selectedChoices}
+                                        setSelectedChoices={setSelectedChoices}
+                                    />
+                                    <Choice
+                                        choice={choice}
+                                        onSelect={onSelect}
+                                    />
+                                </Card>
+                            )}
+                        </Col>
 
-                    <Markdown>{selectedRelease.body}</Markdown>
+                        <Col sm="12" md="12" lg="6">
+                            <Card>
+                                <Markdown>{selectedRelease.body}</Markdown>
+                            </Card>
+                        </Col>
+                    </Row>
                 </>
             )}
         </div>
diff --git a/src/services/GitHubService.ts b/src/services/GitHubService.ts
index 03486c0..c5939b5 100644
--- a/src/services/GitHubService.ts
+++ b/src/services/GitHubService.ts
@@ -3,7 +3,7 @@ export type GithubReleaseAsset = {
     name: string;
 };
 
-const RESOURCES_BASE_URL =
+export const RESOURCES_BASE_URL =
     "https://raw.githubusercontent.com/bdring/fluidnc-releases/main/releases";
 
 export const CONFIG_BASE_URL =
diff --git a/src/services/InstallService.ts b/src/services/InstallService.ts
index e716761..a758ccb 100644
--- a/src/services/InstallService.ts
+++ b/src/services/InstallService.ts
@@ -56,6 +56,52 @@ const convertImagesToFlashFiles = (
 };
 
 export const InstallService = {
+    installImage: async (
+        serialPort: SerialPort,
+        fileData: Uint8Array,
+        onProgress: (FlashProgress) => void,
+        onState: (state: InstallerState) => void,
+        onLogData: (data: string) => void,
+        baud: number = 921600
+    ): Promise<void> => {
+        try {
+            const flashFiles: FlashFile[] = [
+                {
+                    fileName: "firmware.bin",
+                    data: fileData,
+                    address: 0x10000
+                }
+            ];
+
+            await flashDevice(
+                serialPort.getNativeSerialPort(),
+                flashFiles,
+                false,
+                baud,
+                onProgress,
+                onState,
+                onLogData
+            );
+
+            logEvent(analytics, "install", {
+                version: "custom-image",
+                success: true
+            });
+        } catch (error) {
+            logEvent(analytics, "install", {
+                version: "custom-image",
+                success: false,
+                error: error
+            });
+
+            console.error(error);
+            onState(InstallerState.ERROR);
+            throw "Was not able to flash device: " + error;
+        }
+
+        return Promise.resolve();
+    },
+
     installChoice: async (
         release: GithubRelease,
         serialPort: SerialPort,