diff --git a/app/qml/onboarding/MMLogin.qml b/app/qml/onboarding/MMLogin.qml
index e21033cef..66f0f775c 100644
--- a/app/qml/onboarding/MMLogin.qml
+++ b/app/qml/onboarding/MMLogin.qml
@@ -43,9 +43,24 @@ Page {
     }
   }
 
+  MMHeader {
+    id: header
+
+    x: mainColumn.padding
+    y: mainColumn.padding
+    width: parent.width - 2 * mainColumn.padding
+    headerTitle: qsTr("Log In")
+    titleFont: __style.h3
+    backColor: __style.lightGreenColor
+
+    onBackClicked: root.backClicked()
+  }
+
   ScrollView {
     width: parent.width
-    height: parent.height - changeServerButton.height
+    height: parent.height - changeServerButton.height - header.height - 60 * __dp
+    anchors.top: header.bottom
+    anchors.topMargin: 20 * __dp
 
     ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
     ScrollBar.vertical.policy: ScrollBar.AlwaysOff
@@ -57,15 +72,6 @@ Page {
       spacing: 20 * __dp
       padding: 20 * __dp
 
-      MMHeader {
-        width: parent.width - 2 * mainColumn.padding
-        headerTitle: qsTr("Log In")
-        titleFont: __style.h3
-        backColor: __style.lightGreenColor
-
-        onBackClicked: root.backClicked()
-      }
-
       Item { width: 1; height: 1 }
 
       MMInputEditor {
diff --git a/app/qml/onboarding/MMSignUp.qml b/app/qml/onboarding/MMSignUp.qml
index 179e1e358..e6c91e26c 100644
--- a/app/qml/onboarding/MMSignUp.qml
+++ b/app/qml/onboarding/MMSignUp.qml
@@ -43,9 +43,24 @@ Page {
     }
   }
 
+  MMHeader {
+    id: header
+
+    x: mainColumn.padding
+    y: mainColumn.padding
+    width: parent.width - 2 * mainColumn.padding
+    headerTitle: qsTr("Sign Up")
+    titleFont: __style.h3
+    backColor: __style.lightGreenColor
+
+    onBackClicked: root.backClicked()
+  }
+
   ScrollView {
-    width: parent.width
-    height: parent.height
+    width: parent.width + 40 * __dp
+    height: parent.height - header.height - 40 * __dp
+    anchors.top: header.bottom
+    anchors.topMargin: 20 * __dp
 
     ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
     ScrollBar.vertical.policy: ScrollBar.AlwaysOff
@@ -57,17 +72,6 @@ Page {
       spacing: 20 * __dp
       padding: 20 * __dp
 
-      MMHeader {
-        width: parent.width - 2 * mainColumn.padding
-        headerTitle: qsTr("Sign Up")
-        titleFont: __style.h3
-        backColor: __style.lightGreenColor
-
-        onBackClicked: root.backClicked()
-      }
-
-      Item { width: 1; height: 1 }
-
       MMInputEditor {
         width: parent.width - 2 * mainColumn.padding
         title: qsTr("Username")
diff --git a/gallery/qml/pages/OnboardingPage.qml b/gallery/qml/pages/OnboardingPage.qml
index 6259117eb..f564d44cf 100644
--- a/gallery/qml/pages/OnboardingPage.qml
+++ b/gallery/qml/pages/OnboardingPage.qml
@@ -51,16 +51,16 @@ Page {
 
     Button {
       onClicked: {
-        createWorkspace.visible = true
+        acceptInvitation.visible = true
       }
-      text: "Create Workspace"
+      text: "Accept Invitation"
     }
 
     Button {
       onClicked: {
-        acceptInvitation.visible = true
+        createWorkspace.visible = true
       }
-      text: "Accept Invitation"
+      text: "Create Workspace"
     }
 
     Button {
@@ -94,7 +94,7 @@ Page {
     id: signUp
 
     anchors.fill: parent
-    visible: false
+    //visible: false
 
     onSignInClicked: console.log("Sign in clicked")
     onSignUpClicked: console.log("Sign up clicked")
@@ -114,16 +114,16 @@ Page {
     onCreateWorkspaceClicked: console.log("Create new workspace clicked")
   }
 
-
-
   MMCreateWorkspace {
     id: createWorkspace
+
     anchors.fill: parent
     visible: false
 
-    onContinueClicked: {visible=false}
+    onContinueClicked: visible = false
   }
 
+
   MMHowYouFoundUs {
     id: howYouFoundUs
     anchors.fill: parent