diff --git a/resources/qml/AddMachineWizard.qml b/resources/qml/AddMachineWizard.qml
index 06341e140c..4a59f798a5 100644
--- a/resources/qml/AddMachineWizard.qml
+++ b/resources/qml/AddMachineWizard.qml
@@ -42,23 +42,65 @@ UM.Dialog
                 model: UM.Models.availableMachinesModel
                 delegate: RadioButton 
                 { 
+                    id:machine_button
                     exclusiveGroup: printerGroup; 
                     text: model.name; 
                     onClicked: ListView.view.currentIndex = index; 
+                    Component.onCompleted: 
+                    {
+                        if(index == 0)
+                        {
+                            machine_button.checked = true
+                            ListView.view.currentIndex = index; 
+                        }
+                    }
                 }
             }
         }
-
-        Label {
+        Label 
+        {
+            text: qsTr("Variation:");
+        }
+        
+        ScrollView
+        {
+            width: 50
+            height:150
+            
+            ListView 
+            {
+                Component.onCompleted:console.log(model)
+                id: variations_list
+                model: machineList.model.getItem(machineList.currentIndex).variations
+                delegate: RadioButton 
+                { 
+                    id: variation_radio_button
+                    exclusiveGroup: variationGroup; 
+                    text: model.name; 
+                    onClicked: ListView.view.currentIndex = index; 
+                    Component.onCompleted: 
+                    {
+                        if(index == 0)
+                        {
+                            variation_radio_button.checked = true
+                            ListView.view.currentIndex = index; 
+                        }
+                    }
+                }  
+            }
+            
+        }
+        Label 
+        {
             //: Add Printer wizard field label
             text: qsTr("Printer Name:");
         }
-
-        TextField { id: machineName; Layout.fillWidth: true; text: machineList.model.getItem(machineList.currentIndex).name }
+        TextField { id: machineName; Layout.fillWidth: true; text: machineList.model.getItem(machineList.currentIndex).variations.getItem(variations_list.currentIndex).name }
 
         Item { Layout.fillWidth: true; Layout.fillHeight: true; }
 
         ExclusiveGroup { id: printerGroup; }
+        ExclusiveGroup { id: variationGroup; }
     }
 
     rightButtons: [
@@ -70,7 +112,7 @@ UM.Dialog
             {
                 if(machineList.currentIndex != -1) 
                 {
-                    UM.Models.availableMachinesModel.createMachine(machineList.currentIndex, machineName.text)
+                    UM.Models.availableMachinesModel.createMachine(machineList.currentIndex, variations_list.currentIndex, machineName.text)
                     base.visible = false
                 }
             }
diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json
index 77082e3722..7d7c396228 100644
--- a/resources/settings/fdmprinter.json
+++ b/resources/settings/fdmprinter.json
@@ -1,5 +1,6 @@
 {
     "visible": false,
+    "manufacturer": "other",
     "machine_settings": {
         "machine_start_gcode": {
             "default": "G28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
diff --git a/resources/settings/grr_neo.json b/resources/settings/grr_neo.json
index fbec330adc..fa6daa1054 100644
--- a/resources/settings/grr_neo.json
+++ b/resources/settings/grr_neo.json
@@ -1,5 +1,5 @@
 {
-    "id": "GRRneo",
+    "id": "German RepRap Neo",
     "name": "German RepRap Neo",
     "icon": "icon_ultimaker.png",
     "platform": "grr_neo_platform.stl",
diff --git a/resources/settings/hephestos.json b/resources/settings/hephestos.json
index ce97fc21a5..bd702ffd0c 100644
--- a/resources/settings/hephestos.json
+++ b/resources/settings/hephestos.json
@@ -1,5 +1,5 @@
 {
-    "id": "hephestos",
+    "id": "BQ Prusa i3 Hephestos",
     "name": "BQ Prusa i3 Hephestos",
     "platform": "hephestos_platform.stl",
     "inherits": "fdmprinter.json",
diff --git a/resources/settings/hephestos_XL.json b/resources/settings/hephestos_XL.json
index 5a308bab2b..f9b5ee5240 100644
--- a/resources/settings/hephestos_XL.json
+++ b/resources/settings/hephestos_XL.json
@@ -1,5 +1,5 @@
 {
-    "id": "hephestos_XL",
+    "id": "BQ Prusa i3 Hephestos XL",
     "name": "BQ Prusa i3 Hephestos XL",
     "platform": "hephestos_platform.stl",
     "inherits": "fdmprinter.json",
diff --git a/resources/settings/prusai3.json b/resources/settings/prusai3.json
index d411a114e8..ca626976f1 100644
--- a/resources/settings/prusai3.json
+++ b/resources/settings/prusai3.json
@@ -1,5 +1,6 @@
 {
-    "id": "prusa_i3",
+    "id": "Prusa i3",
+    "manufacturer": "ultimaker",
     "icon": "icon_ultimaker2.png",
     "name": "Prusa i3",
     "platform": "prusai3_platform.stl",
diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json
index f845573ec7..7d35d349da 100644
--- a/resources/settings/ultimaker2.json
+++ b/resources/settings/ultimaker2.json
@@ -1,5 +1,6 @@
 {
-    "id": "ultimaker2",
+    "id": "Ultimaker 2",
+    "manufacturer": "ultimaker",
     "name": "Ultimaker 2",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2_platform.obj",
diff --git a/resources/settings/ultimaker2extended.json b/resources/settings/ultimaker2extended.json
index 7ef1e35d3f..720deebfd2 100644
--- a/resources/settings/ultimaker2extended.json
+++ b/resources/settings/ultimaker2extended.json
@@ -1,5 +1,6 @@
 {
-    "id": "ultimaker2extended",
+    "id": "Ultimaker 2 Extended",
+    "manufacturer": "ultimaker",
     "name": "Ultimaker 2 Extended",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2_platform.obj",
diff --git a/resources/settings/ultimaker2go.json b/resources/settings/ultimaker2go.json
index 6d102c4e7c..c173cb5f8e 100644
--- a/resources/settings/ultimaker2go.json
+++ b/resources/settings/ultimaker2go.json
@@ -1,5 +1,6 @@
 {
-    "id": "ultimaker2go",
+    "id": "Ultimaker 2 Go",
+    "manufacturer": "ultimaker",
     "name": "Ultimaker 2 Go",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2go_platform.obj",
diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json
index 360bbbe6b6..4fd921466f 100644
--- a/resources/settings/ultimaker_original.json
+++ b/resources/settings/ultimaker_original.json
@@ -1,5 +1,6 @@
 {
-    "id": "ultimaker_original",
+    "id": "Ultimaker Original",
+    "manufacturer": "ultimaker",
     "name": "Ultimaker Original",
     "icon": "icon_ultimaker.png",
     "platform": "ultimaker_platform.stl",
diff --git a/resources/settings/ultimaker_original_plus.json b/resources/settings/ultimaker_original_plus.json
index 9e5cf6370d..4e002f6d2a 100644
--- a/resources/settings/ultimaker_original_plus.json
+++ b/resources/settings/ultimaker_original_plus.json
@@ -1,5 +1,5 @@
 {
-    "id": "ultimaker_original_plus",
+    "id": "Ultimaker Original",
     "name": "Ultimaker Original+",
     "icon": "icon_ultimaker.png",
     "platform": "ultimaker2_platform.obj",
diff --git a/resources/settings/witbox.json b/resources/settings/witbox.json
index bafcceccdd..9a8c1ed9ea 100644
--- a/resources/settings/witbox.json
+++ b/resources/settings/witbox.json
@@ -1,5 +1,5 @@
 {
-    "id": "witbox",
+    "id": "BQ Witbox",
     "name": "BQ Witbox",
     "platform": "witbox_platform.stl",
     "inherits": "fdmprinter.json",