diff --git a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
index 55f9d1247b..e8e33e8435 100644
--- a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
+++ b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
@@ -494,7 +494,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
     def numJobsPrinting(self):
         num_jobs_printing = 0
         for job in self._print_jobs:
-            if job["status"] == "printing":
+            if job["status"] in ["printing", "wait_cleanup", "sent_to_printer", "pre_print", "post_print"]:
                 num_jobs_printing += 1
         return num_jobs_printing
 
diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
index c53ecdec8c..f53864659b 100644
--- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
+++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
@@ -248,15 +248,19 @@ Rectangle
                                 }
                                 else if (printJob.status == "pre_print" || printJob.status == "sent_to_printer")
                                 {
-                                    return catalog.i18nc("@label:status", "Preparing")
+                                    return catalog.i18nc("@label:status", "Preparing to print")
                                 }
                                 else if (printJob.configuration_changes_required != undefined && printJob.status == "queued")
                                 {
                                     return catalog.i18nc("@label:status", "Action required")
                                 }
-                                else
+                                else if (printJob.Status == "aborted")
                                 {
-                                    return printJob.status;
+                                    return catalog.i18nc("@label:status", "Aborted")
+                                }
+                                else
+                                {   
+                                    return "";
                                 }
                             }
                             return catalog.i18nc("@label:status", "Available");
@@ -317,12 +321,13 @@ Rectangle
                                 switch (printJob.status)
                                 {
                                 case "printing":
+                                case "post_print":
                                     return catalog.i18nc("@label", "Finishes at: ") + OutputDevice.getTimeCompleted(printJob.time_total - printJob.time_elapsed)
                                 case "wait_cleanup":
                                     return catalog.i18nc("@label", "Clear build plate")
                                 case "sent_to_printer":
                                 case "pre_print":
-                                    return catalog.i18nc("@label", "Preparing to print")
+                                    return catalog.i18nc("@label", "Leveling and heating")
                                 case "wait_for_configuration":
                                     return catalog.i18nc("@label", "Not accepting print jobs")
                                 case "queued":
@@ -334,7 +339,7 @@ Rectangle
                                     return "";
                                 }
                             }
-                            return ""
+                            return "";
                         }
                         elide: Text.ElideRight
                         font: UM.Theme.getFont("default")
@@ -344,7 +349,7 @@ Rectangle
                     {
                         text: {
                           if(printJob != null) {
-                              if(printJob.status == "printing" )
+                              if(printJob.status == "printing" || printJob.status == "post_print")
                               {
                                   return OutputDevice.getDateCompleted(printJob.time_total - printJob.time_elapsed)
                               }