diff --git a/DoNExt/app/src/main/res/layout-w600dp/fragment_main.xml b/DoNExt/app/src/main/res/layout-w600dp/fragment_main.xml
index 95d1c35..6b0c0c6 100644
--- a/DoNExt/app/src/main/res/layout-w600dp/fragment_main.xml
+++ b/DoNExt/app/src/main/res/layout-w600dp/fragment_main.xml
@@ -14,23 +14,47 @@
         <include layout="@layout/toolbar" android:id="@+id/toolbar" />
     </android.support.design.widget.AppBarLayout>
 
-    <android.support.percent.PercentRelativeLayout
+    <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:layout_marginTop="?attr/actionBarSize">
+        <android.support.constraint.Guideline
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/left_guideline"
+            app:layout_constraintGuide_percent="0"
+            android:orientation="vertical"/>
+        <android.support.constraint.Guideline
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/center_guideline"
+            app:layout_constraintGuide_percent=".20"
+            android:orientation="vertical"/>
+        <android.support.constraint.Guideline
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/right_guideline"
+            app:layout_constraintGuide_percent="1"
+            android:orientation="vertical"/>
         <android.widget.ListView
             android:id="@+id/list"
-            app:layout_widthPercent="20%"
             android:layout_height="wrap_content"
+            android:layout_width="0dp"
             android:choiceMode="singleChoice"
-            android:listSelector="@drawable/tasklist_select"/>
+            android:listSelector="@drawable/tasklist_select"
+            app:layout_constraintLeft_toRightOf="@+id/left_guideline"
+            app:layout_constraintRight_toLeftOf="@+id/center_guideline" />
         <com.wismna.geoffroy.donext.widgets.NonSwipeableViewPager
             android:id="@+id/container"
-            app:layout_widthPercent="80%"
             android:layout_height="match_parent"
+            android:layout_width="0dp"
             android:layout_toEndOf="@id/list"
             android:background="@android:color/background_light"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    </android.support.percent.PercentRelativeLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_constraintLeft_toRightOf="@+id/center_guideline"
+            app:layout_constraintRight_toLeftOf="@+id/right_guideline" />
+    </android.support.constraint.ConstraintLayout>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file