diff --git a/cura/Settings/MaterialSettingsVisibilityHandler.py b/cura/Settings/MaterialSettingsVisibilityHandler.py
index 44569ea0c3..5b6050d2c0 100644
--- a/cura/Settings/MaterialSettingsVisibilityHandler.py
+++ b/cura/Settings/MaterialSettingsVisibilityHandler.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2017 Ultimaker B.V.
-# Uranium is released under the terms of the LGPLv3 or higher.
+# Cura is released under the terms of the LGPLv3 or higher.
 
 import UM.Settings.Models.SettingVisibilityHandler
 
@@ -11,7 +11,7 @@ class MaterialSettingsVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
             "default_material_print_temperature",
             "material_bed_temperature",
             "material_standby_temperature",
-            "material_flow_temp_graph",
+            #"material_flow_temp_graph",
             "cool_fan_speed",
             "retraction_amount",
             "retraction_speed",
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 bab7db41d4..f53864659b 100644
--- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
+++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
@@ -199,10 +199,10 @@ Rectangle
                 property var showExtended: {
                     if(printJob!= null)
                     {
-                        var extendStates = ["sent_to_printer", "wait_for_configuration", "printing", "pre_print", "post_print", "wait_cleanup"];
+                        var extendStates = ["sent_to_printer", "wait_for_configuration", "printing", "pre_print", "post_print", "wait_cleanup", "queued"];
                         return extendStates.indexOf(printJob.status) !== -1;
                     }
-                    return false
+                    return ! printer.enabled;
                 }
                 visible:
                 {
@@ -227,6 +227,11 @@ Rectangle
                         anchors.right: progressText.left
                         anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         text: {
+                            if ( ! printer.enabled)
+                            {
+                                return catalog.i18nc("@label:status", "Disabled");
+                            }
+
                             if(printJob != null)
                             {
                                 if(printJob.status == "printing" || printJob.status == "post_print")
@@ -243,14 +248,22 @@ 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 if (printJob.Status == "aborted")
+                                {
+                                    return catalog.i18nc("@label:status", "Aborted")
                                 }
                                 else
-                                {
-                                    return ""
+                                {   
+                                    return "";
                                 }
                             }
-                            return catalog.i18nc("@label:status", "Available")
+                            return catalog.i18nc("@label:status", "Available");
                         }
 
                         elide: Text.ElideRight
@@ -292,32 +305,41 @@ Rectangle
 
                     width: parent.width - 2 * UM.Theme.getSize("default_margin").width
 
-                    visible: printJob != null && (["wait_cleanup", "printing", "pre_print", "wait_for_configuration"].indexOf(printJob.status) !== -1)
+                    visible: showExtended
 
                     Label   // Status detail
                     {
                         text:
                         {
+                            if ( ! printer.enabled)
+                            {
+                                return catalog.i18nc("@label", "Not accepting print jobs");
+                            }
+
                             if(printJob != null)
                             {
-                                if(printJob.status == "printing" )
+                                switch (printJob.status)
                                 {
+                                case "printing":
+                                case "post_print":
                                     return catalog.i18nc("@label", "Finishes at: ") + OutputDevice.getTimeCompleted(printJob.time_total - printJob.time_elapsed)
-                                }
-                                if(printJob.status == "wait_cleanup")
-                                {
+                                case "wait_cleanup":
                                     return catalog.i18nc("@label", "Clear build plate")
-                                }
-                                if(printJob.status == "sent_to_printer" || printJob.status == "pre_print")
-                                {
-                                    return catalog.i18nc("@label", "Preparing to print")
-                                }
-                                if(printJob.status == "wait_for_configuration")
-                                {
+                                case "sent_to_printer":
+                                case "pre_print":
+                                    return catalog.i18nc("@label", "Leveling and heating")
+                                case "wait_for_configuration":
                                     return catalog.i18nc("@label", "Not accepting print jobs")
+                                case "queued":
+                                    if (printJob.configuration_changes_required != undefined)
+                                    {
+                                        return catalog.i18nc("@label", "Configuration change");
+                                    }
+                                default:
+                                    return "";
                                 }
                             }
-                            return ""
+                            return "";
                         }
                         elide: Text.ElideRight
                         font: UM.Theme.getFont("default")
@@ -327,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)
                               }
diff --git a/setup.py b/setup.py
index f68d5683d9..a91ba535d5 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name="Cura",
         author="Ultimaker",
         author_email="a.hiemstra@ultimaker.com",
         url="http://software.ultimaker.com/",
-        license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)",
+        license="GNU LESSER GENERAL PUBLIC LICENSE (LGPL)",
         scripts=["cura_app.py"],
         windows=[{"script": "cura_app.py", "dest_name": "Cura", "icon_resources": [(1, "icons/cura.ico")]}],
         #console=[{"script": "cura_app.py"}],