diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json
index c14ce1ac31..58cbaa3b22 100644
--- a/resources/definitions/anycubic_4max.def.json
+++ b/resources/definitions/anycubic_4max.def.json
@@ -83,6 +83,6 @@
 
         "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"},
-        "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
+        "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
     }
 }
diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json
index 8a96d98023..6e81085fdd 100644
--- a/resources/definitions/anycubic_i3_mega.def.json
+++ b/resources/definitions/anycubic_i3_mega.def.json
@@ -58,7 +58,7 @@
         },
         "machine_end_gcode":
         {
-            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
+            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
         }
     }
 }
diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
index 2930bc8dbe..9376909070 100644
--- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml
+++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
@@ -48,17 +48,19 @@ Item
 
         Item
         {
-            width: parent.width
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: UM.Theme.getSize("default_margin").width
 
             Label
             {
                 id: explainLabel
                 height: contentHeight
-                width: parent.width
+                anchors.left: parent.left
+                anchors.right: parent.right
                 anchors.top: parent.top
-                anchors.margins: UM.Theme.getSize("default_margin").width
-                font: UM.Theme.getFont("default")
 
+                font: UM.Theme.getFont("default")
                 text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
             }
 
@@ -66,8 +68,10 @@ Item
             {
                 id: userInputFields
                 height: childrenRect.height
-                width: parent.width
+                anchors.left: parent.left
+                anchors.right: parent.right
                 anchors.top: explainLabel.bottom
+                anchors.topMargin: UM.Theme.getSize("default_margin").width
 
                 Cura.TextField
                 {
@@ -76,7 +80,6 @@ Item
                     height: addPrinterButton.height
                     anchors.verticalCenter: addPrinterButton.verticalCenter
                     anchors.left: parent.left
-                    anchors.margins: UM.Theme.getSize("default_margin").width
 
                     validator: RegExpValidator
                     {
@@ -92,8 +95,7 @@ Item
                     id: addPrinterButton
                     anchors.top: parent.top
                     anchors.left: hostnameField.right
-                    anchors.margins: UM.Theme.getSize("default_margin").width
-
+                    anchors.leftMargin: UM.Theme.getSize("default_margin").width
                     text: catalog.i18nc("@button", "Add")
                     onClicked:
                     {
diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml
index 065d5e60df..249eca5bd6 100644
--- a/resources/qml/Widgets/ScrollableTextArea.qml
+++ b/resources/qml/Widgets/ScrollableTextArea.qml
@@ -15,6 +15,14 @@ ScrollView
 {
     property alias textArea: _textArea
 
+    clip: true
+
+    background: Rectangle  // Border
+    {
+        border.color: UM.Theme.getColor("lining")
+        border.width: UM.Theme.getSize("default_lining").width
+    }
+
     TextArea
     {
         id: _textArea
@@ -22,11 +30,5 @@ ScrollView
         textFormat: TextEdit.PlainText
         renderType: Text.NativeRendering
         selectByMouse: true
-
-        background: Rectangle  // Border
-        {
-            border.color: UM.Theme.getColor("lining")
-            border.width: UM.Theme.getSize("default_lining").width
-        }
     }
 }