diff --git a/package.json b/package.json
index 823c34d1..b0ddb397 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fdm-monster/client",
-  "version": "1.5.0-rc6",
+  "version": "1.5.0-rc7",
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "repository": {
diff --git a/public/img/thumbail_unknown.jpg b/public/img/thumbail_unknown.jpg
new file mode 100644
index 00000000..391cd188
Binary files /dev/null and b/public/img/thumbail_unknown.jpg differ
diff --git a/src/App.vue b/src/App.vue
index f23f3537..b654de6b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,6 +25,7 @@
     <BatchJsonCreateDialog />
     <YamlImportExportDialog />
     <FileExplorerSideNav />
+    <BatchReprintDialog />
   </v-app>
 </template>
 
@@ -42,6 +43,7 @@ import { useSettingsStore } from "./store/settings.store";
 import { useDialogsStore } from "@/store/dialog.store";
 import BatchJsonCreateDialog from "@/components/Generic/Dialogs/BatchJsonCreateDialog.vue";
 import YamlImportExportDialog from "@/components/Generic/Dialogs/YamlImportExportDialog.vue";
+import BatchReprintDialog from "@/components/Generic/Dialogs/BatchReprintDialog.vue";
 import { useFeatureStore } from "./store/features.store";
 import { useSnackbar } from "./shared/snackbar.composable";
 import AppProgressSnackbar from "./components/Generic/Snackbars/AppProgressSnackbar.vue";
@@ -71,6 +73,7 @@ export default defineComponent({
     PrinterMaintenanceDialog,
     FileExplorerSideNav,
     BatchJsonCreateDialog,
+    BatchReprintDialog,
   },
   setup: () => {
     return {
diff --git a/src/backend/batch.service.ts b/src/backend/batch.service.ts
index 9694598e..d91dbffe 100644
--- a/src/backend/batch.service.ts
+++ b/src/backend/batch.service.ts
@@ -1,5 +1,7 @@
 import { BaseService } from "./base.service";
 import { IdType } from "@/utils/id.type";
+import { ServerApi } from "@/backend/server.api";
+import { ReprintFileDto } from "@/models/batch/reprint.dto";
 
 export class BatchService extends BaseService {
   static async batchConnectUsb(printerIds: IdType[]) {
@@ -13,4 +15,14 @@ export class BatchService extends BaseService {
   static async batchToggleEnabled(printerIds: IdType[], enabled: boolean) {
     return await this.postApi(`api/batch/toggle-enabled`, { printerIds, enabled });
   }
+
+  static async batchGetLastPrintedFiles(printerIds: IdType[]) {
+    const path = ServerApi.batchGetLastPrintedFilesRoute;
+    return await this.postApi<ReprintFileDto[]>(path, { printerIds });
+  }
+
+  static async batchReprintFiles(prints: { printerId: IdType; path: string }[]) {
+    const path = ServerApi.batchReprintFilesRoute;
+    return await this.postApi(path, { prints });
+  }
 }
diff --git a/src/backend/printer-file.service.ts b/src/backend/printer-file.service.ts
index 81be590c..ac3653d5 100644
--- a/src/backend/printer-file.service.ts
+++ b/src/backend/printer-file.service.ts
@@ -23,11 +23,6 @@ export class PrinterFileService extends BaseService {
     return (await this.getApi(path)) as PrinterFileDto[];
   }
 
-  static async batchReprintFiles(printerIds: IdType[]) {
-    const path = ServerApi.printerFilesBatchReprintRoute;
-    return await this.postApi(path, { printerIds });
-  }
-
   static async selectAndPrintFile(printerId: IdType, filePath: string, print = true) {
     const path = ServerApi.printerFilesSelectAndPrintRoute(printerId);
     return await this.postApi(path, { filePath, print });
diff --git a/src/backend/server.api.ts b/src/backend/server.api.ts
index 3b54a793..4ff7e783 100644
--- a/src/backend/server.api.ts
+++ b/src/backend/server.api.ts
@@ -14,10 +14,14 @@ export class ServerApi {
 
   static floorRoute = `${ServerApi.base}/floor`;
 
+  static batchRoute = `${ServerApi.base}/batch`;
+  static batchGetLastPrintedFilesRoute = `${ServerApi.batchRoute}/reprint/list`;
+  static batchReprintFilesRoute = `${ServerApi.batchRoute}/reprint/execute`;
+
   static printCompletionRoute = `${ServerApi.base}/print-completion`;
 
   static printerFilesRoute = `${ServerApi.base}/printer-files`;
-  static printerFilesBatchReprintRoute = `${ServerApi.printerFilesRoute}/batch/reprint-files`;
+
   static printerFilesPurgeRoute = `${ServerApi.printerFilesRoute}/purge`;
 
   static customGCodeRoute = `${ServerApi.base}/custom-gcode`;
diff --git a/src/components/AboutHelp/AboutView.vue b/src/components/AboutHelp/AboutView.vue
index b14bf9ef..aa36ff88 100644
--- a/src/components/AboutHelp/AboutView.vue
+++ b/src/components/AboutHelp/AboutView.vue
@@ -108,30 +108,18 @@
   </v-card>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref } from "vue";
-import { AppService } from "../../backend/app.service";
-import { version } from "../../../package.json";
+<script lang="ts" setup>
+import { onMounted, ref } from "vue";
+import { AppService } from "@/backend/app.service";
+import { version as clientVersion } from "../../../package.json";
 
-export default defineComponent({
-  name: "AboutView",
-  components: {},
-  setup: () => {
-    return {
-      serverVersion: ref(""),
-      monsterPiVersion: ref<string | null>(""),
-      version,
-    };
-  },
-  async created() {},
-  async mounted() {
-    const versionSpec = await AppService.getVersion();
-    this.serverVersion = versionSpec.version;
-    this.monsterPiVersion = versionSpec.monsterPi;
-  },
-  props: {},
-  computed: {},
-  methods: {},
-  watch: {},
+const serverVersion = ref("");
+const monsterPiVersion = ref<string | null>("");
+const version = ref(clientVersion);
+
+onMounted(async () => {
+  const versionSpec = await AppService.getVersion();
+  serverVersion.value = versionSpec.version;
+  monsterPiVersion.value = versionSpec.monsterPi;
 });
 </script>
diff --git a/src/components/Generic/Actions/PrinterCreateAction.vue b/src/components/Generic/Actions/PrinterCreateAction.vue
index db25777c..3f96c0d6 100644
--- a/src/components/Generic/Actions/PrinterCreateAction.vue
+++ b/src/components/Generic/Actions/PrinterCreateAction.vue
@@ -26,7 +26,7 @@ export default defineComponent({
   computed: {},
   methods: {
     openCreatePrinterDialog() {
-      this.dialogsStore.openDialog(DialogName.AddOrUpdatePrinterDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdatePrinterDialog);
     },
   },
 });
diff --git a/src/components/Generic/Dialogs/BaseDialog.vue b/src/components/Generic/Dialogs/BaseDialog.vue
index 8601339c..19284d60 100644
--- a/src/components/Generic/Dialogs/BaseDialog.vue
+++ b/src/components/Generic/Dialogs/BaseDialog.vue
@@ -9,65 +9,64 @@
     <slot></slot>
   </v-dialog>
 </template>
-<script lang="ts">
-import { defineComponent } from "vue";
-import { usePrinterStore } from "../../../store/printer.store";
+
+<script lang="ts" setup>
+import { computed, onBeforeUnmount, onMounted } from "vue";
 import { useDialogsStore } from "@/store/dialog.store";
 import { DialogName } from "@/components/Generic/Dialogs/dialog.constants";
 import { onKeyStroke } from "@vueuse/core";
+import { useDialog } from "@/shared/dialog.composable";
 
-export default defineComponent({
-  name: "BaseDialog",
-  components: {},
-  setup: () => {
-    return {
-      printersStore: usePrinterStore(),
-      dialogsStore: useDialogsStore(),
-    };
-  },
-  async created() {
-    onKeyStroke("Escape", (e) => {
-      if (this.showingDialog) {
-        e.preventDefault();
-        this.emitEscape();
-      }
-    });
-  },
-  async mounted() {
-    this.dialogsStore.registerDialogReference(this.id);
-  },
-  beforeDestroy() {
-    this.dialogsStore.unregisterDialogReference(this.id);
+const props = defineProps({
+  id: {
+    type: String as () => DialogName,
+    required: true,
   },
-  props: {
-    id: {
-      type: String as () => DialogName,
-      required: true,
-    },
-    maxWidth: {
-      type: String,
-      default: "400px",
-    },
+  maxWidth: {
+    type: String,
+    default: "400px",
   },
-  computed: {
-    dialog() {
-      return this.id ? this.dialogsStore.dialogsById[this.id] : undefined;
-    },
-    showingDialog() {
-      if (!this.id) return;
+});
+const dialogsStore = useDialogsStore();
+const emit = defineEmits(["escape", "opened", "beforeOpened"]);
+const dialog = useDialog(props.id);
 
-      const isOpened = this.dialogsStore.isDialogOpened(this.id);
-      if (isOpened) {
-        console.debug(`[BaseDialog ${this.id}] Showing dialog: ${this.dialog?.opened}`);
-      }
-      return isOpened;
-    },
-  },
-  methods: {
-    emitEscape() {
-      this.$emit("escape");
-    },
-  },
-  watch: {},
+function openedCallback(input: any) {
+  return emit("opened", input);
+}
+
+function beforeOpenedCallback(input: any) {
+  return emit("beforeOpened", input);
+}
+
+onMounted(async () => {
+  onKeyStroke("Escape", (e) => {
+    if (showingDialog.value) {
+      e.preventDefault();
+      emitEscape();
+    }
+  });
+  dialogsStore.registerDialogReference(props.id, {
+    beforeOpenedCallback,
+    openedCallback,
+  });
+});
+
+onBeforeUnmount(() => {
+  dialogsStore.unregisterDialogReference(props.id);
 });
+
+const showingDialog = computed(() => {
+  if (!props.id) return;
+
+  const isOpened = dialogsStore.isDialogOpened(props.id);
+  if (isOpened) {
+    console.debug(`[BaseDialog ${props.id}] Showing dialog: ${dialog?.isDialogOpened()}`);
+  }
+  return isOpened;
+});
+
+function emitEscape() {
+  emit("escape");
+}
 </script>
diff --git a/src/components/Generic/Dialogs/BatchReprintDialog.ts b/src/components/Generic/Dialogs/BatchReprintDialog.ts
new file mode 100644
index 00000000..41c6a9be
--- /dev/null
+++ b/src/components/Generic/Dialogs/BatchReprintDialog.ts
@@ -0,0 +1,5 @@
+import { IdType } from "@/utils/id.type";
+
+interface ReprintPrinterIds {
+  printerIds: IdType[];
+}
diff --git a/src/components/Generic/Dialogs/BatchReprintDialog.vue b/src/components/Generic/Dialogs/BatchReprintDialog.vue
new file mode 100644
index 00000000..02a9ce99
--- /dev/null
+++ b/src/components/Generic/Dialogs/BatchReprintDialog.vue
@@ -0,0 +1,153 @@
+<template>
+  <BaseDialog
+    :id="dialog.dialogId"
+    max-width="1000px"
+    @beforeOpened="onBeforeDialogOpened"
+    @escape="closeDialog()"
+    @opened="onDialogOpened"
+  >
+    <v-card class="pa-4">
+      <v-card-title>
+        <span class="text-h5"> Batch - Submit Reprint Jobs </span>
+      </v-card-title>
+      <v-card-text>
+        <v-alert v-if="errorLoading?.length" color="error">
+          {{ errorLoading }}
+        </v-alert>
+        <span v-if="loading"> Loading... </span>
+        <div v-else>
+          <v-list dense>
+            <v-subheader> Reprinted Files - Select from list </v-subheader>
+            <v-list-item-group v-model="selectedItems" multiple>
+              <v-list-item
+                v-for="(item, i) in reprintableFiles"
+                :key="i"
+                :value="item"
+                :disabled="
+                  item.connectionState !== 'Operational' ||
+                  item.reprintState !== ReprintState.LastPrintReady
+                "
+              >
+                <v-list-item-icon>
+                  <v-icon v-if="item.reprintState == ReprintState.LastPrintReady">checklist</v-icon>
+                  <v-icon v-if="item.reprintState == ReprintState.NoLastPrint">
+                    question_mark
+                  </v-icon>
+                  <v-icon v-if="item.reprintState == ReprintState.PrinterNotAvailable">
+                    signal_disconnected
+                  </v-icon>
+                </v-list-item-icon>
+                <v-list-item-content>
+                  <v-list-item-title v-if="item.file?.path?.length">
+                    {{ item.file?.path }}
+                    <v-chip v-if="item.connectionState !== 'Operational'"> Printer busy </v-chip>
+                  </v-list-item-title>
+                  <v-list-item-title v-else-if="item.reprintState == ReprintState.NoLastPrint">
+                    No file is present to print again
+                  </v-list-item-title>
+                  <v-list-item-title v-else> OctoPrint cant be reached </v-list-item-title>
+                  <v-list-item-subtitle>
+                    Printer '{{ printerStore.printer(item.printerId)?.name ?? "Unknown printer" }}'
+                  </v-list-item-subtitle>
+                </v-list-item-content>
+              </v-list-item>
+            </v-list-item-group>
+          </v-list>
+        </div>
+
+        <div class="mt-3">
+          <div v-if="submitting">
+            <v-progress-circular class="ma-3" indeterminate color="blue"></v-progress-circular>
+            Submitting
+          </div>
+          <div v-else-if="selectedItems.length > 0">
+            {{ selectedItems.length }} reprint selected
+          </div>
+          <div v-else>Must select at least one file</div>
+        </div>
+        <br />
+
+        <VBtn :disabled="submitting || selectedItems.length === 0" @click="submitBatchReprints()">
+          Submit Batch Reprint
+        </VBtn>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn text @click="dialog.closeDialog()">Close</v-btn>
+      </v-card-actions>
+    </v-card>
+  </BaseDialog>
+</template>
+<script lang="ts" setup>
+import { DialogName } from "@/components/Generic/Dialogs/dialog.constants";
+import { useDialog } from "@/shared/dialog.composable";
+import { onBeforeUnmount, onMounted, ref } from "vue";
+import { BatchService } from "@/backend/batch.service";
+import { IdType } from "@/utils/id.type";
+import { ReprintFileDto, ReprintState } from "@/models/batch/reprint.dto";
+import { usePrinterStore } from "@/store/printer.store";
+import { errorSummary } from "@/utils/error.utils";
+import { useSnackbar } from "@/shared/snackbar.composable";
+
+const printerStore = usePrinterStore();
+const inputPrinterIds = ref();
+const dialog = useDialog(DialogName.BatchReprintDialog);
+const loading = ref(false);
+const submitting = ref(false);
+const reprintableFiles = ref<ReprintFileDto[]>([]);
+const selectedItems = ref<ReprintFileDto[]>([]);
+const errorLoading = ref("");
+const snackbar = useSnackbar();
+
+onMounted(() => {
+  console.debug("Mounted");
+});
+
+onBeforeUnmount(() => {
+  console.debug("Unmount");
+});
+
+function onBeforeDialogOpened(_: IdType[]) {
+  loading.value = true;
+}
+
+async function onDialogOpened(printerIds: IdType[]) {
+  inputPrinterIds.value = printerIds;
+  try {
+    const response = await BatchService.batchGetLastPrintedFiles(inputPrinterIds.value);
+    reprintableFiles.value = response;
+    selectedItems.value = response.filter(
+      (r) => r.connectionState === "Operational" && r.reprintState == ReprintState.LastPrintReady
+    );
+  } catch (e: any) {
+    errorLoading.value = e.code.toString() ?? "";
+  }
+
+  loading.value = false;
+}
+
+async function submitBatchReprints() {
+  submitting.value = true;
+  try {
+    await BatchService.batchReprintFiles(
+      selectedItems.value
+        .filter((v) => v.file?.path)
+        .map((v) => ({
+          printerId: v.printerId,
+          path: v.file?.path || "",
+        }))
+    );
+    printerStore.clearSelectedPrinters();
+    snackbar.info("Action completed", "Your reprinted jobs are starting", 5000);
+    closeDialog();
+  } catch (e: any) {
+    errorLoading.value = errorSummary(e);
+  } finally {
+    submitting.value = false;
+  }
+}
+
+function closeDialog() {
+  dialog.closeDialog(dialog.context());
+}
+</script>
diff --git a/src/components/Generic/Dialogs/dialog.constants.ts b/src/components/Generic/Dialogs/dialog.constants.ts
index da8cf04d..978f58f4 100644
--- a/src/components/Generic/Dialogs/dialog.constants.ts
+++ b/src/components/Generic/Dialogs/dialog.constants.ts
@@ -1,6 +1,8 @@
 export enum DialogName {
   // The JSON import dialog, which is used to import a JSON file with a printer array into the application.
   BatchJsonCreate = "BatchJsonCreate",
+  // Stateful dialog meant for verifying the last printed file of each selected printer
+  BatchReprintDialog = "BatchReprintDialog",
   // The YAML import and export dialog, which is used to import and export a YAML file with a printer array into and from the application.
   // This YAML is for internal backup and restore only and is not compatible with external projects.
   YamlImportExport = "YamlImportExport",
diff --git a/src/components/Generic/FileExplorerSideNav.vue b/src/components/Generic/FileExplorerSideNav.vue
index 4ffb644c..86deefa7 100644
--- a/src/components/Generic/FileExplorerSideNav.vue
+++ b/src/components/Generic/FileExplorerSideNav.vue
@@ -553,7 +553,7 @@ export default defineComponent({
       }
 
       this.printersStore.setMaintenanceDialogPrinter(this.storedSideNavPrinter);
-      this.dialogsStore.openDialog(DialogName.PrinterMaintenanceDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.PrinterMaintenanceDialog);
       this.closeDrawer();
     },
     async refreshFiles() {
@@ -599,7 +599,7 @@ export default defineComponent({
     clickSettings() {
       if (!this.storedSideNavPrinter) return;
       this.printersStore.setUpdateDialogPrinter(this.storedSideNavPrinter);
-      this.dialogsStore.openDialog(DialogName.AddOrUpdatePrinterDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdatePrinterDialog);
       this.closeDrawer();
     },
     async clickPrintFile(file: PrinterFileDto) {
diff --git a/src/components/PrinterGrid/HomeToolbar.vue b/src/components/PrinterGrid/HomeToolbar.vue
index 92c60a56..e3fb4256 100644
--- a/src/components/PrinterGrid/HomeToolbar.vue
+++ b/src/components/PrinterGrid/HomeToolbar.vue
@@ -14,13 +14,13 @@
       </v-btn>
     </v-btn-toggle>
 
-    <v-btn color="primary" class="mt-0 ml-6" v-if="!printerStore.printers?.length" to="/printers">
+    <v-btn v-if="!printerStore.printers?.length" class="mt-0 ml-6" color="primary" to="/printers">
       You have no printers. Click here to start!
     </v-btn>
-    <v-alert color="primary" class="mt-4 ml-12" v-if="floorStore.floorlessPrinters.length">
+    <v-alert v-if="floorStore.floorlessPrinters.length" class="mt-4 ml-12" color="primary">
       <v-icon>warning</v-icon>
-      {{ floorStore.floorlessPrinters.length }} unplaced printer(s)!</v-alert
-    >
+      {{ floorStore.floorlessPrinters.length }} unplaced printer(s)!
+    </v-alert>
     <div class="ma-4 pt-6">
       <v-switch v-model="gridStore.gridEditMode" label="Printer Relocate Mode"></v-switch>
     </div>
@@ -51,41 +51,25 @@
   </v-toolbar>
 </template>
 
-<script lang="ts">
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import { computed, ref } from "vue";
 import { usePrinterStore } from "@/store/printer.store";
 import { useGridStore } from "@/store/grid.store";
 import { useFloorStore } from "@/store/floor.store";
 import { usePrinterStateStore } from "@/store/printer-state.store";
 
-export default defineComponent({
-  name: "HomeToolbar",
-  components: {},
-  setup() {
-    return {
-      printerStore: usePrinterStore(),
-      printerStateStore: usePrinterStateStore(),
-      floorStore: useFloorStore(),
-      gridStore: useGridStore(),
-    };
-  },
-  data(): {
-    selectedFloorToggleIndex: number;
-  } {
-    return {
-      selectedFloorToggleIndex: 0,
-    };
-  },
-  computed: {
-    floors() {
-      return this.floorStore.floors;
-    },
-  },
-  methods: {
-    changeFloorIndex(index: any) {
-      this.floorStore.changeSelectedFloorByIndex(index);
-      this.selectedFloorToggleIndex = index;
-    },
-  },
+const printerStore = usePrinterStore();
+const printerStateStore = usePrinterStateStore();
+const floorStore = useFloorStore();
+const gridStore = useGridStore();
+const selectedFloorToggleIndex = ref<number>(0);
+
+const floors = computed(() => {
+  return floorStore.floors;
 });
+
+function changeFloorIndex(index: any) {
+  floorStore.changeSelectedFloorByIndex(index);
+  selectedFloorToggleIndex.value = index;
+}
 </script>
diff --git a/src/components/PrinterGrid/PrinterGrid.vue b/src/components/PrinterGrid/PrinterGrid.vue
index b2d5ab25..8c4a0375 100644
--- a/src/components/PrinterGrid/PrinterGrid.vue
+++ b/src/components/PrinterGrid/PrinterGrid.vue
@@ -76,8 +76,8 @@
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import { computed, defineComponent, onMounted, ref } from "vue";
 import PrinterGridTile from "@/components/PrinterGrid/PrinterGridTile.vue";
 import { totalVuetifyColumnCount } from "@/shared/printer-grid.constants";
 import { usePrinterStore } from "@/store/printer.store";
@@ -87,75 +87,43 @@ import { dragAppId, INTENT, PrinterPlace } from "@/shared/drag.constants";
 import { useSettingsStore } from "@/store/settings.store";
 import { useFloorStore } from "@/store/floor.store";
 
-export default defineComponent({
-  components: { PrinterGridTile },
-  data(): {
-    maxColumnUnits: number;
-  } {
-    return {
-      maxColumnUnits: totalVuetifyColumnCount,
-    };
-  },
-  setup() {
-    console.debug("Setup grid");
-    return {
-      printerStore: usePrinterStore(),
-      floorStore: useFloorStore(),
-      settingsStore: useSettingsStore(),
-      gridStore: useGridStore(),
-    };
-  },
-  async created() {
-    await this.printerStore.loadPrinters();
-    await this.floorStore.loadFloors();
-  },
-  computed: {
-    printerMatrix() {
-      return this.floorStore.gridSortedPrinters;
-    },
-    columnWidth() {
-      return totalVuetifyColumnCount / this.columns;
-    },
-    columns() {
-      return this.settingsStore.gridCols / 2;
-    },
-    rows() {
-      return this.settingsStore.gridRows / 2;
-    },
-    printers() {
-      return this.printerStore.printers;
-    },
-    selectedFloorLevel() {
-      return this.floorStore.selectedFloor?.floor;
-    },
-  },
-  methods: {
-    onDragStart(printer: PrinterDto, ev: DragEvent) {
-      if (!ev.dataTransfer) return;
-      if (!printer.id) return;
+console.debug("Setup grid");
 
-      ev.dataTransfer.setData(
-        "text",
-        JSON.stringify({
-          appId: dragAppId,
-          intent: INTENT.PRINTER_PLACE,
-          printerId: printer.id,
-        } as PrinterPlace)
-      );
-    },
-    getPrinter(col: number, row: number) {
-      const x = col;
-      const y = row;
-      if (!this.printerMatrix?.length || !this.printerMatrix[x]) return undefined;
-      return this.printerMatrix[x][y];
-    },
-    updateGridMatrix() {
-      this.printerMatrix = this.floorStore.gridSortedPrinters;
-    },
-  },
-  async mounted() {},
-  beforeDestroy() {},
+const printerStore = usePrinterStore();
+const floorStore = useFloorStore();
+const settingsStore = useSettingsStore();
+const gridStore = useGridStore();
+
+onMounted(async () => {
+  await printerStore.loadPrinters();
+  await floorStore.loadFloors();
 });
+
+const printerMatrix = computed(() => floorStore.gridSortedPrinters);
+const columns = computed(() => settingsStore.gridCols / 2);
+const columnWidth = computed(() => totalVuetifyColumnCount / columns.value);
+const rows = computed(() => settingsStore.gridRows / 2);
+
+function onDragStart(printer: PrinterDto, ev: DragEvent) {
+  if (!ev.dataTransfer) return;
+  if (!printer.id) return;
+
+  ev.dataTransfer.setData(
+    "text",
+    JSON.stringify({
+      appId: dragAppId,
+      intent: INTENT.PRINTER_PLACE,
+      printerId: printer.id,
+    } as PrinterPlace)
+  );
+}
+
+function getPrinter(col: number, row: number) {
+  const x = col;
+  const y = row;
+  if (!printerMatrix.value?.length || !printerMatrix.value[x]) return undefined;
+  return printerMatrix.value[x][y];
+}
 </script>
 
 <style>
diff --git a/src/components/PrinterGrid/PrinterGridTile.vue b/src/components/PrinterGrid/PrinterGridTile.vue
index 5ec21a1d..5753b3ee 100644
--- a/src/components/PrinterGrid/PrinterGridTile.vue
+++ b/src/components/PrinterGrid/PrinterGridTile.vue
@@ -273,7 +273,7 @@ export default defineComponent({
     },
     clickOpenSettings() {
       this.printerStore.setUpdateDialogPrinter(this.printer);
-      this.dialogsStore.openDialog(DialogName.AddOrUpdatePrinterDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdatePrinterDialog);
     },
     async clickEmergencyStop() {
       if (!this.printerId) return;
diff --git a/src/components/PrinterGrid/PrinterGridView.vue b/src/components/PrinterGrid/PrinterGridView.vue
index 7112da2a..08b02c8f 100644
--- a/src/components/PrinterGrid/PrinterGridView.vue
+++ b/src/components/PrinterGrid/PrinterGridView.vue
@@ -47,7 +47,7 @@
             <v-icon class="pr-2" small>delete</v-icon>
             Clear all ({{ selectedPrinters.length }})
           </v-btn>
-          <v-btn class="ml-2" color="primary" x-small @click="$refs.fileUpload.click()">
+          <v-btn class="ml-2" color="primary" x-small @click="$refs.fileUpload?.click()">
             Select gcode file
           </v-btn>
           <v-btn
@@ -75,8 +75,8 @@
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from "vue";
+<script lang="ts" setup>
+import { computed, ref } from "vue";
 import PrinterGrid from "@/components/PrinterGrid/PrinterGrid.vue";
 import { PrinterDto } from "@/models/printers/printer.model";
 import { PrintersService } from "@/backend";
@@ -89,92 +89,80 @@ import { useFeatureStore } from "@/store/features.store";
 import { usePrinterStateStore } from "@/store/printer-state.store";
 import { useGridStore } from "@/store/grid.store";
 import { useSnackbar } from "@/shared/snackbar.composable";
+import { DialogName } from "@/components/Generic/Dialogs/dialog.constants";
+import { useDialog } from "@/shared/dialog.composable";
 
-export default defineComponent({
-  name: "PrinterGridView",
-  components: { PrinterGrid, HomeToolbar },
-  setup: () => {
-    return {
-      gridStore: useGridStore(),
-      printersStore: usePrinterStore(),
-      printerStateStore: usePrinterStateStore(),
-      uploadsStore: useUploadsStore(),
-      featureStore: useFeatureStore(),
-      snackbar: useSnackbar(),
-    };
-  },
-  async created() {},
-  async mounted() {},
-  props: {},
-  data(): {
-    selectedFile?: File;
-    viewedPrinter?: PrinterDto;
-  } {
-    return {
-      selectedFile: undefined,
-      viewedPrinter: undefined,
-    };
-  },
-  computed: {
-    isBatchReprintFeatureAvailable(): boolean {
-      return this.featureStore.hasFeature("batchReprintCalls");
-    },
-    hasPrintersSelected(): boolean {
-      return this.selectedPrinters?.length > 0;
-    },
-    selectedPrinters() {
-      return this.printersStore.selectedPrinters;
-    },
-    fileUpload() {
-      return this.$refs.fileUpload as InstanceType<typeof HTMLInputElement>;
-    },
-  },
-  methods: {
-    deselectFile() {
-      (this.$refs.fileUpload as InstanceType<typeof HTMLInputElement>)!.value = "";
-      this.selectedFile = undefined;
-    },
-    formatBytes: formatBytes,
-    clearSelectedPrinters() {
-      this.printersStore.clearSelectedPrinters();
-    },
-    async batchReprintFiles() {
-      await this.printersStore.batchReprintFiles();
-    },
-    async uploadFile() {
-      const selectedPrinters = this.selectedPrinters;
-      const accessiblePrinters = selectedPrinters.filter((p) =>
-        this.printerStateStore.isApiResponding(p.id)
-      );
-
-      if (!this.selectedFile) return;
-
-      // Checking and informing user
-      const incompleteListCount = selectedPrinters.length - accessiblePrinters.length;
-      if (incompleteListCount > 0) {
-        this.snackbar.openInfoMessage({
-          title: `${incompleteListCount} printers inaccessible`,
-          subtitle: "These were skipped from uploading.",
-        });
-      }
-
-      const uploads = convertMultiPrinterFileToQueue(accessiblePrinters, this.selectedFile);
-      this.uploadsStore.queueUploads(uploads);
-
-      this.fileUpload!.value = "";
-      this.clearSelectedPrinters();
-    },
-    filesSelected() {
-      if (!this.fileUpload.files) return (this.selectedFile = undefined);
-
-      this.selectedFile = this.fileUpload.files[0];
-    },
-    deselectPrinter(printer: PrinterDto) {
-      this.printersStore.toggleSelectedPrinter(printer);
-    },
-    openPrinter(printer: PrinterDto) {
-      PrintersService.openPrinterURL(printer.printerURL);
-    },
-  },
-});
+const gridStore = useGridStore();
+const printersStore = usePrinterStore();
+const printerStateStore = usePrinterStateStore();
+const uploadsStore = useUploadsStore();
+const featureStore = useFeatureStore();
+const snackbar = useSnackbar();
+
+const selectedFile = ref<File | undefined>(undefined);
+const isBatchReprintFeatureAvailable = computed(() => featureStore.hasFeature("batchReprintCalls"));
+const hasPrintersSelected = computed(() => printersStore.selectedPrinters.length > 0);
+const selectedPrinters = computed(() => printersStore.selectedPrinters);
+const fileUpload = ref<HTMLInputElement | null>(null);
+
+const deselectFile = () => {
+  if (fileUpload.value) {
+    fileUpload.value.value = "";
+    selectedFile.value = undefined;
+  }
+};
+
+const clearSelectedPrinters = () => {
+  printersStore.clearSelectedPrinters();
+};
+
+const batchReprintFiles = async () => {
+  const output = await useDialog(DialogName.BatchReprintDialog).handleAsync(
+    printersStore.selectedPrinters?.map((p) => p.id)
+  );
+  console.log("[PrinterGridView] Dialog completed", output);
+  // await printersStore.batchReprintFiles();
+};
+
+const uploadFile = () => {
+  const selectedPrintersValue = selectedPrinters.value;
+  const accessiblePrinters = selectedPrintersValue.filter((p) =>
+    printerStateStore.isApiResponding(p.id)
+  );
+
+  if (!selectedFile.value) return;
+
+  // Checking and informing user
+  const incompleteListCount = selectedPrintersValue.length - accessiblePrinters.length;
+  if (incompleteListCount > 0) {
+    snackbar.openInfoMessage({
+      title: `${incompleteListCount} printers inaccessible`,
+      subtitle: "These were skipped from uploading.",
+    });
+  }
+
+  const uploads = convertMultiPrinterFileToQueue(accessiblePrinters, selectedFile.value);
+  uploadsStore.queueUploads(uploads);
+
+  if (fileUpload.value) {
+    fileUpload.value.value = "";
+  }
+  clearSelectedPrinters();
+};
+
+const filesSelected = () => {
+  if (fileUpload.value && fileUpload.value.files) {
+    selectedFile.value = fileUpload.value.files[0];
+  } else {
+    selectedFile.value = undefined;
+  }
+};
+
+const deselectPrinter = (printer: PrinterDto) => {
+  printersStore.toggleSelectedPrinter(printer);
+};
+
+const openPrinter = (printer: PrinterDto) => {
+  PrintersService.openPrinterURL(printer.printerURL);
+};
 </script>
diff --git a/src/components/PrinterList/PrintersView.vue b/src/components/PrinterList/PrintersView.vue
index 93a4e3ed..88d2d3b2 100644
--- a/src/components/PrinterList/PrintersView.vue
+++ b/src/components/PrinterList/PrintersView.vue
@@ -182,10 +182,10 @@ export default defineComponent({
     },
     openEditDialog(printer: PrinterDto) {
       this.printerStore.setUpdateDialogPrinter(printer);
-      this.dialogsStore.openDialog(DialogName.AddOrUpdatePrinterDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdatePrinterDialog);
     },
     openCreatePrinterDialog() {
-      this.dialogsStore.openDialog(DialogName.AddOrUpdatePrinterDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdatePrinterDialog);
     },
     clickRow(item: PrinterDto, event: any) {
       if (event.isExpanded) {
@@ -196,10 +196,10 @@ export default defineComponent({
       }
     },
     async openImportJsonPrintersDialog() {
-      this.dialogsStore.openDialog(DialogName.BatchJsonCreate);
+      this.dialogsStore.openDialogWithContext(DialogName.BatchJsonCreate);
     },
     async openYamlImportExportDialog() {
-      this.dialogsStore.openDialog(DialogName.YamlImportExport);
+      this.dialogsStore.openDialogWithContext(DialogName.YamlImportExport);
     },
     async toggleEnabled(event: any, printer: PrinterDto) {
       if (!printer.id) {
diff --git a/src/components/Settings/FloorSettings.vue b/src/components/Settings/FloorSettings.vue
index 666f4ca1..10748490 100644
--- a/src/components/Settings/FloorSettings.vue
+++ b/src/components/Settings/FloorSettings.vue
@@ -181,7 +181,7 @@ export default defineComponent({
       return this.printersStore.printer(floorPrinter.printerId);
     },
     async createFloor() {
-      this.dialogsStore.openDialog(DialogName.AddOrUpdateFloorDialog);
+      this.dialogsStore.openDialogWithContext(DialogName.AddOrUpdateFloorDialog);
     },
     setEditedPrinterFloorName() {
       this.editedFloorName = this.selectedFloor.name;
diff --git a/src/main.ts b/src/main.ts
index d9e22f52..d9fc0afa 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,6 +25,7 @@ configureVeeValidate();
 registerFileDropDirective();
 registerPrinterPlaceDirective();
 
+console.debug("Production", process.env.NODE_ENV === "production");
 Sentry.init({
   Vue,
   dsn: "https://f64683e8d1cb4ac291434993cff1bf9b@o4503975545733120.ingest.sentry.io/4503975546912768",
@@ -49,7 +50,7 @@ Sentry.init({
 
 Vue.use(PiniaVuePlugin);
 Vue.use(VueRouter);
-Vue.component(BaseDialog.name, BaseDialog);
+Vue.component("BaseDialog", BaseDialog);
 
 Vue.config.errorHandler = (err) => {
   if (err instanceof AxiosError) {
diff --git a/src/models/batch/reprint.dto.ts b/src/models/batch/reprint.dto.ts
new file mode 100644
index 00000000..b8880eb6
--- /dev/null
+++ b/src/models/batch/reprint.dto.ts
@@ -0,0 +1,75 @@
+import { IdType } from "@/utils/id.type";
+import { OctoPrintStatisticsDto, Prints, Refs } from "@/models/printers/printer-file.model";
+import { GcodeAnalysisDto } from "@/models/printers/gcode/gcode-analysis.model";
+
+export interface ReprintFileDto {
+  file?: CreateOrUpdatePrinterFileDto;
+  reprintState: ReprintState;
+  connectionState: ConnectionState | null;
+  printerId: IdType;
+}
+
+export enum ReprintState {
+  PrinterNotAvailable = 0,
+  NoLastPrint = 1,
+  LastPrintReady = 2,
+}
+
+export type ConnectionState =
+  | "Operational"
+  | "Printing"
+  | "Starting print from SD"
+  | "Starting to send file to SD"
+  | "Printing from SD"
+  | "Transferring file to SD"
+  | "Sending file to SD"
+  | "Starting"
+  | "Pausing"
+  | "Paused"
+  | "Resuming"
+  | "Finishing"
+  | "Cancelling"
+  | "Error"
+  | "Offline"
+  | "Offline after error"
+  | "Opening serial connection"
+  | "Detecting serial connection"
+  | "Unknown State";
+
+export class CreateOrUpdatePrinterFileDto {
+  id?: IdType;
+  printerId?: IdType;
+
+  name: string;
+  date: number;
+  display: string;
+  gcodeAnalysis?: GcodeAnalysisDto;
+
+  hash: string;
+  origin: string;
+  path: string;
+  prints: Prints;
+  refs: Refs;
+  size: number;
+  statistics: OctoPrintStatisticsDto;
+  type: string;
+  typePath: string[]; // machinecode gcode
+
+  customData?: OctoPrintCustomDto;
+}
+
+export interface OctoPrintCustomDto {
+  // Custom metadata that is updated on hash changes only
+  userdata?: any;
+
+  // Optional parts due to plugins and such
+  displayLayerProgress?: DisplayLayerProgressDto;
+  thumbnail?: string;
+  thumbnail_src?: string;
+  [k: string]: any;
+}
+
+export interface DisplayLayerProgressDto {
+  // numberstring
+  totalLayerCountWithoutOffset: string;
+}
diff --git a/src/models/printers/connection-options.model.ts b/src/models/octoprint/connection-options.model.ts
similarity index 100%
rename from src/models/printers/connection-options.model.ts
rename to src/models/octoprint/connection-options.model.ts
diff --git a/src/models/printers/gcode/gcode-analysis.model.ts b/src/models/printers/gcode/gcode-analysis.model.ts
index ede3e4a4..cb583c4b 100644
--- a/src/models/printers/gcode/gcode-analysis.model.ts
+++ b/src/models/printers/gcode/gcode-analysis.model.ts
@@ -22,7 +22,7 @@ export interface PrintingArea {
   minZ: number;
 }
 
-export interface GCodeAnalysis {
+export interface GcodeAnalysisDto {
   dimensions: GCodeDimensions;
   estimatedPrintTime: number;
   filament: FilamentToolCollection;
diff --git a/src/models/printers/printer-file.model.ts b/src/models/printers/printer-file.model.ts
index a21cb1d0..d4a037fc 100644
--- a/src/models/printers/printer-file.model.ts
+++ b/src/models/printers/printer-file.model.ts
@@ -1,4 +1,4 @@
-import { GCodeAnalysis } from "@/models/printers/gcode/gcode-analysis.model";
+import { GcodeAnalysisDto } from "@/models/printers/gcode/gcode-analysis.model";
 
 export interface LastPrintMoment {
   date: number;
@@ -17,7 +17,7 @@ export interface Refs {
   resource: string;
 }
 
-export interface Statistics {
+export interface OctoPrintStatisticsDto {
   averagePrintTime: {
     [k: string]: number; //profile name like _default
   };
@@ -29,7 +29,7 @@ export interface Statistics {
 export interface PrinterFileDto {
   date: number;
   display: string;
-  gcodeAnalysis: GCodeAnalysis;
+  gcodeAnalysis: GcodeAnalysisDto;
   hash: string;
   name: string;
   origin: string;
@@ -37,7 +37,7 @@ export interface PrinterFileDto {
   prints: Prints;
   refs: Refs;
   size: number;
-  statistics: Statistics;
+  statistics: OctoPrintStatisticsDto;
   type: string;
   typePath: string[]; // machinecode gcode
 }
diff --git a/src/shared/dialog.composable.ts b/src/shared/dialog.composable.ts
index a4e0c336..7debb445 100644
--- a/src/shared/dialog.composable.ts
+++ b/src/shared/dialog.composable.ts
@@ -1,14 +1,41 @@
 import { useDialogsStore } from "@/store/dialog.store";
 import { DialogName } from "@/components/Generic/Dialogs/dialog.constants";
+import { watchEffect } from "vue";
 
-export function useDialog(dialogId: DialogName) {
+export function useDialog<T = any, O = any>(dialogId: DialogName) {
   const dialogStore = useDialogsStore();
+
+  async function openDialog(context?: T) {
+    const beforeOpenedCallback = dialogStore.getBeforeOpenedCallback(dialogId);
+    if (beforeOpenedCallback) {
+      beforeOpenedCallback(context);
+    }
+
+    dialogStore.openDialogWithContext(dialogId, context);
+
+    const openedCallback = dialogStore.getOpenedCallback(dialogId);
+    if (openedCallback) {
+      openedCallback(context);
+    }
+  }
+
   return {
     dialogId,
     dialogStore,
-    openDialog: (context?: any) => dialogStore.openDialog(dialogId, context),
+    openDialog,
     context: () => dialogStore.getContext(dialogId),
-    closeDialog: () => dialogStore.closeDialog(dialogId),
+    closeDialog: (output?: O) => dialogStore.closeDialog(dialogId, output),
     isDialogOpened: () => dialogStore.isDialogOpened(dialogId),
+    handleAsync: async (input: T): Promise<O> => {
+      await openDialog(input);
+
+      return new Promise<O>((resolve) => {
+        watchEffect(() => {
+          if (!dialogStore.isDialogOpened(dialogId)) {
+            resolve(dialogStore.getOutput(dialogId));
+          }
+        });
+      });
+    },
   };
 }
diff --git a/src/store/dialog.store.ts b/src/store/dialog.store.ts
index 72edb52c..3b05f70d 100644
--- a/src/store/dialog.store.ts
+++ b/src/store/dialog.store.ts
@@ -1,10 +1,13 @@
 import { defineStore } from "pinia";
 import { DialogName } from "@/components/Generic/Dialogs/dialog.constants";
 
-interface DialogReference {
+interface DialogReference<T = any> {
   id: DialogName;
   opened: boolean;
+  beforeOpenedCallback?: (input?: T) => void;
+  openedCallback?: (input?: T) => void;
   context?: any;
+  output?: any;
 }
 
 export type DialogsById = { [k: string]: DialogReference };
@@ -23,11 +26,22 @@ export const useDialogsStore = defineStore("Dialog", {
     dialogs(): DialogReference[] {
       return this.ids.map((i) => this.dialogsById[i]);
     },
+    getBeforeOpenedCallback() {
+      return (id: DialogName) => this.dialogsById[id]?.beforeOpenedCallback;
+    },
+    getOpenedCallback() {
+      return (id: DialogName) => this.dialogsById[id]?.openedCallback;
+    },
     getContext() {
       return (id: DialogName) => {
         return this.dialogsById[id]?.context;
       };
     },
+    getOutput() {
+      return (id: DialogName) => {
+        return this.dialogsById[id]?.output;
+      };
+    },
     isDialogOpened() {
       return (id: DialogName) => {
         return this.dialogsById[id]?.opened;
@@ -35,7 +49,7 @@ export const useDialogsStore = defineStore("Dialog", {
     },
   },
   actions: {
-    openDialog(id: DialogName, context?: any) {
+    openDialogWithContext<T = any>(id: DialogName, context?: T) {
       let dialog = this.dialogsById[id];
       if (!dialog) {
         dialog = this.registerDialogReference(id);
@@ -48,13 +62,14 @@ export const useDialogsStore = defineStore("Dialog", {
       };
       console.debug(`[Pinia Dialog ${id}] Opened with context`, context);
     },
-    closeDialog(id: DialogName) {
+    closeDialog(id: DialogName, output?: any) {
       let dialog = this.dialogsById[id];
       if (!dialog) {
         dialog = this.registerDialogReference(id);
       }
       dialog.opened = false;
       delete dialog.context;
+      dialog.output = output;
       // Vue 2 reactivity issue
       this.dialogsById = {
         ...this.dialogsById,
@@ -65,18 +80,29 @@ export const useDialogsStore = defineStore("Dialog", {
       delete this.dialogsById[id];
       this.ids = this.ids.filter((i) => i !== id);
     },
-    registerDialogReference(id?: DialogName) {
-      if (!id) throw new Error("Cannot unregister undefined dialog reference");
+    registerDialogReference<T = any>(
+      id?: DialogName,
+      callbacks?: {
+        beforeOpenedCallback?: (input?: T) => void;
+        openedCallback?: (input?: T) => void;
+      }
+    ) {
+      if (!id) {
+        throw new Error("Cannot unregister undefined dialog reference");
+      }
 
       console.debug(`[Pinia Dialog ${id}] Registered`);
       const existingDialog = this.dialogsById[id];
       if (existingDialog) {
+        console.debug(`[Pinia Dialog ${id}]  Already registered dialog, not registering again`);
         return existingDialog;
       }
 
       const dialogRef = {
         id,
         opened: false,
+        beforeOpenedCallback: callbacks?.beforeOpenedCallback,
+        openedCallback: callbacks?.openedCallback,
       };
       this.dialogsById[id] = dialogRef;
       this.ids.push(id);
diff --git a/src/store/printer.store.ts b/src/store/printer.store.ts
index 5f2da164..23bf61aa 100644
--- a/src/store/printer.store.ts
+++ b/src/store/printer.store.ts
@@ -10,7 +10,6 @@ import {
   isPrinterDisabled,
   isPrinterDisconnected,
   isPrinterInMaintenance,
-  isPrinterPrinting,
 } from "@/shared/printer-state.constants";
 
 interface State {
@@ -200,16 +199,5 @@ export const usePrinterStore = defineStore("Printers", {
         await PrinterJobService.stopPrintJob(printer.id);
       }
     },
-    async batchReprintFiles() {
-      const printerIds = this.selectedPrinters.map((p) => p.id);
-      if (!printerIds.length) {
-        throw new Error("No printers selected to reprint files");
-      }
-
-      this.clearSelectedPrinters();
-
-      const results = await PrinterFileService.batchReprintFiles(printerIds);
-      console.debug(results);
-    },
   },
 });
diff --git a/src/utils/error.utils.ts b/src/utils/error.utils.ts
new file mode 100644
index 00000000..a92d71e8
--- /dev/null
+++ b/src/utils/error.utils.ts
@@ -0,0 +1,3 @@
+export function errorSummary(e: any) {
+  return e.message ? `${e.message}\n ${e.stack}` : `'${e}'`;
+}
diff --git a/tsconfig.json b/tsconfig.json
index 324cee2c..ad9ad7c6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,14 @@
 {
+  "vueCompilerOptions": {
+    "experimentalModelPropName": {
+      "checked": {
+        "input": {
+          "type": "checkbox"
+        },
+        "v-checkbox": true
+      }
+    }
+  },
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",