diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index b5aecb9b56..ade2e69cd2 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -349,6 +349,8 @@ class CuraApplication(QtApplication):
         self.globalContainerStackChanged.connect(self._onGlobalContainerChanged)
         self._onGlobalContainerChanged()
 
+        self._plugin_registry.addSupportedPluginExtension("curaplugin", "Cura Plugin")
+
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index f5907a8c63..1a8288e648 100755
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -838,6 +838,7 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
                     "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1",
                     "children":
                     {
                         "wall_0_extruder_nr":
@@ -850,7 +851,8 @@
                             "settable_per_mesh": true,
                             "settable_per_extruder": false,
                             "settable_per_meshgroup": true,
-                            "settable_globally": true
+                            "settable_globally": true,
+                            "enabled": "machine_extruder_count > 1"
                         },
                         "wall_x_extruder_nr":
                         {
@@ -862,7 +864,8 @@
                             "settable_per_mesh": true,
                             "settable_per_extruder": false,
                             "settable_per_meshgroup": true,
-                            "settable_globally": true
+                            "settable_globally": true,
+                            "enabled": "machine_extruder_count > 1"
                         }
                     }
                 },
@@ -918,7 +921,8 @@
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
-                    "settable_globally": true
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1"
                 },
                 "top_bottom_thickness":
                 {
@@ -1191,7 +1195,8 @@
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
-                    "settable_globally": true
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1"
                 },
                 "infill_sparse_density":
                 {
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index e04f2cc741..73fd05f8fa 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -177,6 +177,14 @@ Column
         Text
         {
             id: variantLabel
+            width: parent.width * 0.30
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: variantRow.left
+
+            font: UM.Theme.getFont("default");
+            color: UM.Theme.getColor("text");
+
             text:
             {
                 var label;
@@ -194,12 +202,6 @@ Column
                 }
                 return "%1:".arg(label);
             }
-
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: variantRow.left
-            width: parent.width * 0.30
-            font: UM.Theme.getFont("default");
-            color: UM.Theme.getColor("text");
         }
 
         Button
@@ -208,8 +210,8 @@ Column
             height: parent.height * 0.60
             width: height
 
-            anchors.left: variantLabel.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.right: materialVariantContainer.left
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
 
             visible: extrudersList.visible
@@ -245,6 +247,8 @@ Column
 
         Item
         {
+            id: materialVariantContainer
+
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right