diff --git a/app/build.gradle b/app/build.gradle
index 550019cc5..15cb7c312 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,6 +99,7 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
 
     compile 'com.borjabravo:readmoretextview:2.1.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index d96b00675..01e5c2af3 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -1,163 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#0c609c"
-              android:gravity="center">
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#0c609c"
+    android:gravity="center"
+    android:orientation="horizontal">
 
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.55" />
 
     <GridLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
         android:columnCount="2"
-        >
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline">
 
         <ImageView
-            android:src="@drawable/mount_zao"
             android:id="@+id/mount_zao"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_mount_zao"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/mount_zao" />
 
         <ImageView
-            android:src="@drawable/llamas"
             android:id="@+id/llamas"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_llamas"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/llamas" />
 
         <ImageView
-            android:src="@drawable/rainbow_bridge"
             android:id="@+id/rainbow_bridge"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_rainbow_bridge"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/rainbow_bridge" />
 
         <ImageView
-            android:src="@drawable/tulip"
             android:id="@+id/tulip"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_tulip"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/tulip" />
 
     </GridLayout>
 
 
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center_vertical"
-            >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:layout_marginLeft="@dimen/standard_gap"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
         <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_2_text"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text"
-                android:textAlignment="center"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/normal_text"
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_2_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_2_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
-</LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index d950ffc1d..6d954e2d7 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -1,59 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#0c609c"
-    android:gravity="center"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#0c609c">
 
-    <RelativeLayout
-        android:layout_gravity="center"
-        android:layout_width="240dp"
-        android:layout_height="wrap_content"
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
         android:layout_marginEnd="@dimen/standard_gap"
         android:layout_marginRight="@dimen/standard_gap"
-        >
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.50" />
+
+    <LinearLayout
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap">
 
         <ImageView
-            android:src="@drawable/selfie_x"
             android:id="@+id/selfie_x"
             android:layout_width="110dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:contentDescription="@string/welcome_image_no_selfies"
-            />
+            android:src="@drawable/selfie_x" />
 
         <ImageView
-            android:src="@drawable/proprietary_x"
             android:id="@+id/proprietary_x"
-            android:layout_marginStart="@dimen/standard_gap"
-            android:layout_marginLeft="@dimen/standard_gap"
             android:layout_width="110dp"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/selfie_x"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             android:contentDescription="@string/welcome_image_proprietary"
-            />
+            android:src="@drawable/proprietary_x" />
 
-    </RelativeLayout>
+    </LinearLayout>
 
 
-    <LinearLayout android:orientation="vertical"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        >
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
             android:maxWidth="240dp"
             android:text="@string/tutorial_3_text"
-            android:layout_gravity="center"
-            android:textStyle="bold"
             android:textAlignment="center"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/normal_text"
-            android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -64,51 +87,49 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_3_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_3_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_3_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -121,24 +142,23 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_3_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index 79f48829b..e7d704e15 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -1,42 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#0c609c"
     android:gravity="center"
-    >
+    android:orientation="horizontal">
 
-    <ImageView
+    <TextView
+        android:id="@+id/welcomeYesButton"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/sydney_opera_house"
-        android:paddingLeft="@dimen/large_gap"
-        android:paddingRight="@dimen/standard_gap"
-        android:paddingTop="@dimen/large_gap"
-        android:paddingBottom="@dimen/large_gap"
-        android:adjustViewBounds="true"
-        android:layout_gravity="center"
-        android:contentDescription="@string/welcome_image_sydney_opera_house"
-        />
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout android:orientation="vertical"
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        >
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.60" />
+
+    <ImageView
+        android:layout_width="370dp"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"
+        android:paddingBottom="@dimen/large_gap"
+        android:paddingLeft="@dimen/tiny_gap"
+        android:paddingStart="@dimen/tiny_gap"
+        android:paddingRight="@dimen/standard_gap"
+        android:paddingEnd="@dimen/standard_gap"
+        android:paddingTop="@dimen/large_gap"
+        android:src="@drawable/sydney_opera_house"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
             android:maxWidth="240dp"
             android:text="@string/tutorial_4_text"
-            android:layout_gravity="center"
-            android:textStyle="bold"
             android:textAlignment="center"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/normal_text"
-            android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -47,23 +77,22 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_4_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_4_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -76,21 +105,20 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_4_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -103,24 +131,23 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_4_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index b4fbe9048..73b96fc14 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -1,51 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#0c609c"
-              android:gravity="center"
-        >
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#0c609c">
+
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.50" />
+
 
     <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_welcome_wikipedia"
+        android:src="@drawable/welcome_wikipedia"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_1_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/normal_text"
+            android:textStyle="bold" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/welcome_wikipedia"
-            android:layout_marginEnd="@dimen/standard_gap"
-            android:layout_marginRight="@dimen/standard_gap"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/welcome_image_welcome_wikipedia"
-        />
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center_vertical"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_1_text"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text"
-                android:textAlignment="center"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"/>
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_1_subtext"
-                android:layout_gravity="center"
-                android:textAlignment="center"
-                android:paddingTop="@dimen/standard_gap"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"
-            />
+            android:maxWidth="240dp"
+            android:paddingTop="@dimen/standard_gap"
+            android:text="@string/tutorial_1_subtext"
+            android:textAlignment="center"
+            android:textColor="@android:color/white" />
     </LinearLayout>
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>