diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c5aac80009882180102c38b38ae04d4f8f2e9b7c..75511f596e41e247f7571aac1c88b014de13bf65 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,9 @@
 <android.support.v4.widget.DrawerLayout 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:id="@+id/drawer_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:fitsSystemWindows="true"
-  tools:openDrawer="start">
+  android:fitsSystemWindows="true">
 
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/content_chatlist.xml b/app/src/main/res/layout/content_chatlist.xml
index 76715e8e3ce75d4254750d61c3bce2cdffcf2a8c..7c7cba9cb62882854db66a64d1f46edb328558bb 100644
--- a/app/src/main/res/layout/content_chatlist.xml
+++ b/app/src/main/res/layout/content_chatlist.xml
@@ -1,11 +1,13 @@
 <de.kuschku.quasseldroid_ng.util.ui.NavigationDrawerLayout 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:layout_gravity="start"
   android:background="?android:attr/windowBackground"
   android:fitsSystemWindows="true"
-  app:insetForeground="?attr/colorPrimaryDark">
+  app:insetForeground="?attr/colorPrimaryDark"
+  tools:showIn="@layout/activity_main">
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 8151d2669b8cc7c546e73ad70c3871e569665bc3..18b4eb99c2371053b3b7bf520e158c7a89669202 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,6 +1,8 @@
 <ScrollView 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">
+  android:layout_height="match_parent"
+  tools:showIn="@layout/activity_main">
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_nicklist.xml b/app/src/main/res/layout/content_nicklist.xml
index d056659f040debc25c381349d4aefcfcfdde0787..78c1b3ab1317a303e0c2973e2351938981d23c08 100644
--- a/app/src/main/res/layout/content_nicklist.xml
+++ b/app/src/main/res/layout/content_nicklist.xml
@@ -1,8 +1,10 @@
 <de.kuschku.quasseldroid_ng.util.ui.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/nickList"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:layout_gravity="end"
   android:background="?android:attr/windowBackground"
   android:clipToPadding="false"
-  android:fitsSystemWindows="true" />
+  android:fitsSystemWindows="true"
+  tools:showIn="@layout/activity_main" />