diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml
index b17c24300a..2990b16795 100644
--- a/resources/qml/WelcomePages/DataCollectionsContent.qml
+++ b/resources/qml/WelcomePages/DataCollectionsContent.qml
@@ -31,7 +31,7 @@ Item
     // Area where the cloud contents can be put. Pictures, texts and such.
     Item
     {
-        id: cloudContentsArea
+        id: contentsArea
         anchors.top: titleLabel.bottom
         anchors.bottom: getStartedButton.top
         anchors.left: parent.left
diff --git a/resources/qml/WelcomePages/UserAgreementContent.qml b/resources/qml/WelcomePages/UserAgreementContent.qml
index dfec088ad6..792a4df991 100644
--- a/resources/qml/WelcomePages/UserAgreementContent.qml
+++ b/resources/qml/WelcomePages/UserAgreementContent.qml
@@ -12,45 +12,52 @@ import Cura 1.1 as Cura
 //
 Item
 {
-    Column
+    UM.I18nCatalog { id: catalog; name: "cura" }
+
+    Label
     {
+        id: titleLabel
         anchors.top: parent.top
+        anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
+        anchors.horizontalCenter: parent.horizontalCenter
+        horizontalAlignment: Text.AlignHCenter
+        text: catalog.i18nc("@label", "User Agreement")
+        color: UM.Theme.getColor("primary_button")
+        font: UM.Theme.getFont("large_bold")
+        renderType: Text.NativeRendering
+    }
+
+
+    Item
+    {
+        anchors.top: titleLabel.bottom
+        anchors.bottom: agreeButton.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.margins: 20
+        anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
 
-        UM.I18nCatalog { id: catalog; name: "cura" }
+    Label
+    {
+        id: disclaimerLineLabel
+        /*
+        anchors.top: titleLabel.bottom
+        anchors.bottom: agreeButton.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        */
+        anchors.centerIn: parent
+        anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
 
-        spacing: 40
+        width: (parent.width * 2 / 3) | 0
 
-        // Placeholder
-        Label { text: " " }
-
-        Label
-        {
-            id: titleLabel
-            anchors.horizontalCenter: parent.horizontalCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: catalog.i18nc("@label", "User Agreement")
-            color: UM.Theme.getColor("primary_button")
-            font: UM.Theme.getFont("large_bold")
-            renderType: Text.NativeRendering
-        }
-
-        Label
-        {
-            width: parent.width * 2 / 3
-            id: disclaimerLineLabel
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: "<p><b>Disclaimer by Ultimaker</b></p>"
-                + "<p>Please read this disclaimer carefully.</p>"
-                + "<p>Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and perfoemance of Ultimaker software is with you.</p>"
-                + "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
-            textFormat: Text.RichText
-            wrapMode: Text.WordWrap
-            font: UM.Theme.getFont("default")
-            renderType: Text.NativeRendering
-        }
+        text: "<p><b>Disclaimer by Ultimaker</b></p>"
+            + "<p>Please read this disclaimer carefully.</p>"
+            + "<p>Except when otherwise stated in writing, Ultimaker provides any Ultimaker software or third party software \"As is\" without warranty of any kind. The entire risk as to the quality and perfoemance of Ultimaker software is with you.</p>"
+            + "<p>Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.</p>"
+        textFormat: Text.RichText
+        wrapMode: Text.WordWrap
+        font: UM.Theme.getFont("default")
+        renderType: Text.NativeRendering
+    }
     }
 
     Cura.PrimaryButton