diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
index 90db436..49a8d5a 100644
--- a/qml/pages/FirstPage.qml
+++ b/qml/pages/FirstPage.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import QtQuick.Layouts 1.1
 
 Page {
     id: page
@@ -30,7 +31,9 @@ Page {
         Column {
             id: column
             width: parent.width
-            spacing: 10
+            spacing: Theme.paddingLarge
+            anchors.top: pageHeader.bottom
+            anchors.horizontalCenter: parent.horizontalCenter
 
             Label {
                 id: firstLabel
@@ -41,20 +44,43 @@ Page {
                 horizontalAlignment: Text.AlignHCenter
             }
 
-            TextField {
-                id: secondField
+            GridLayout {
+                id: grid
                 width: parent.width
-                placeholderText: "Enter text"
-                font.pixelSize: Theme.fontSizeLarge
-                font.bold: true
-            }
+                rows: 2
+                columns: 2
 
-            TextField {
-                id: thirdField
-                width: parent.width
-                placeholderText: "Enter text again"
-                font.pixelSize: Theme.fontSizeLarge
-                font.bold: true
+                TextField {
+                    id: field0
+                    Layout.fillWidth: true
+                    placeholderText: "Enter text"
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.bold: true
+                }
+
+                TextField {
+                    id: field1
+                    Layout.fillWidth: true
+                    placeholderText: "Enter text again"
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.bold: true
+                }
+
+                TextField {
+                    id: field2
+                    Layout.fillWidth: true
+                    placeholderText: "Enter text"
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.bold: true
+                }
+
+                TextField {
+                    id: field3
+                    Layout.fillWidth: true
+                    placeholderText: "Enter text again"
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.bold: true
+                }
             }
         }
     }