diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index 91eb810a70..25e7656999 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -845,6 +845,7 @@ class Toolbox(QObject, Extension):
     def buildMaterialsModels(self) -> None:
         self._metadata["materials_showcase"] = []
         self._metadata["materials_available"] = []
+        self._metadata["materials_generic"] = []
 
         processed_authors = [] # type: List[str]
 
diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml
index bddefa036b..473fd87a34 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml
@@ -12,6 +12,7 @@ Item {
     id: root;
     property var printJob: null;
     property var running: isRunning(printJob);
+    property var assigned: isAssigned(printJob);
 
     Button {
         id: button;
@@ -102,7 +103,7 @@ Item {
 
             PrintJobContextMenuItem {
                 enabled: {
-                    if (printJob && printJob.state == "queued") {
+                    if (printJob && printJob.state == "queued" && !assigned) {
                         if (OutputDevice && OutputDevice.queuedPrintJobs[0]) {
                             return OutputDevice.queuedPrintJobs[0].key != printJob.key;
                         }
@@ -117,7 +118,7 @@ Item {
             }
 
             PrintJobContextMenuItem {
-                enabled: printJob && printJob.state == "queued";
+                enabled: printJob && !running;
                 onClicked: {
                     deleteConfirmationDialog.visible = true;
                     popup.close();
@@ -210,4 +211,10 @@ Item {
         }
         return ["paused", "printing", "pre_print"].indexOf(job.state) !== -1;
     }
+    function isAssigned(job) {
+        if (!job) {
+            return false;
+        }
+        return job.assignedPrinter ? true : false;
+    }
 }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
index 5dfda15edd..6c6df7d7fb 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
@@ -36,7 +36,7 @@ Item {
                 return UM.Theme.getColor("monitor_card_background");
             }
         }
-        height: childrenRect.height;
+        height: childrenRect.height + UM.Theme.getSize("default_margin").height;
         layer.effect: DropShadow {
             radius: root.shadowRadius;
             verticalOffset: root.shadowOffset;
@@ -46,6 +46,11 @@ Item {
         width: parent.width - 2 * shadowRadius;
 
         Column {
+            id: cardContents;
+            anchors {
+                top: parent.top;
+                topMargin: UM.Theme.getSize("default_margin").height;
+            }
             height: childrenRect.height;
             width: parent.width;
             spacing: UM.Theme.getSize("default_margin").height;
@@ -53,7 +58,7 @@ Item {
             // Main card
             Item {
                 id: mainCard;
-                height: 60 * screenScaleFactor + UM.Theme.getSize("default_margin").width;
+                height: 60 * screenScaleFactor;
                 width: parent.width;
 
                 // Machine icon
@@ -109,7 +114,7 @@ Item {
                     id: printerInfo;
                     anchors {
                         left: machineIcon.right;
-                        leftMargin: UM.Theme.getSize("default_margin").width;
+                        leftMargin: UM.Theme.getSize("wide_margin").width;
                         right: collapseIcon.left;
                         verticalCenter: machineIcon.verticalCenter;
                     }
@@ -250,11 +255,16 @@ Item {
                 iconSource: "../svg/camera-icon.svg";
                 visible: root.printer && root.printJob;
             }
+        }
 
-            // Progress bar
-            PrinterCardProgressBar {
-                visible: printer && printer.activePrintJob != null;
+        // Progress bar
+        PrinterCardProgressBar {
+            anchors {
+                top: cardContents.bottom;
+                topMargin: UM.Theme.getSize("default_margin").height;
             }
+            visible: printer && printer.activePrintJob != null;
+            width: parent.width;
         }
     }
 }
diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json
index 714407adc0..8ec0c3d29d 100644
--- a/resources/bundled_packages/cura.json
+++ b/resources/bundled_packages/cura.json
@@ -1149,7 +1149,7 @@
             "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/",
             "author": {
                 "author_id": "Fiberlogy",
-                "diplay_name": "Fiberlogy S.A.",
+                "display_name": "Fiberlogy S.A.",
                 "email": "grzegorz.h@fiberlogy.com",
                 "website": "http://fiberlogy.com"
             }