diff --git a/res/layout/article.xml b/res/layout/article.xml
index c26632a..5c857c5 100644
--- a/res/layout/article.xml
+++ b/res/layout/article.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/scroll" >
+    android:id="@+id/scroll"
+    tools:context="fr.gaulupeau.apps.Poche.ReadArticle" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/article_list.xml b/res/layout/article_list.xml
index a02a4be..fbd4c3b 100644
--- a/res/layout/article_list.xml
+++ b/res/layout/article_list.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical" android:padding="10sp"
-        android:layout_width="fill_parent" android:layout_height="fill_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:padding="10sp"
+    android:layout_width="fill_parent" android:layout_height="fill_parent" >
 
         <TextView
             android:id="@+id/listitem_titre"
diff --git a/res/layout/list.xml b/res/layout/list.xml
index b1e9a6e..91a62e0 100644
--- a/res/layout/list.xml
+++ b/res/layout/list.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linearLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context="fr.gaulupeau.apps.Poche.ListArticles" >
 
     <ListView
         android:id="@+id/liste_articles"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 218500a..55b351f 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scrollView1"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content"
+    tools:context="fr.gaulupeau.apps.Poche.Poche" >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -27,7 +30,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:text="@string/hello"
-            android:textSize="28sp" />
+            android:textSize="25sp" />
 
         <View
             android:id="@+id/view1"
@@ -59,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_weight="0"
-            android:visibility="invisible" />
+            android:visibility="gone" />
 
     </LinearLayout>
 
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 1879d91..0b3e3b8 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="vertical" >
+    android:orientation="vertical"
+    tools:context="fr.gaulupeau.apps.Poche.Settings" >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,6 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginTop="10dp"
             android:text="@string/txtAPIUsername"
             android:textSize="18sp" />
 
@@ -62,6 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginTop="10dp"
             android:text="@string/txtAPIToken"
             android:textSize="18sp" />
 
@@ -88,6 +93,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginTop="10dp"
             android:text="@string/btnDone" />
 
         <TextView
@@ -95,6 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginTop="10dp"
             android:text="@string/version"
             android:textSize="12sp" />
         
@@ -103,9 +110,10 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:layout_marginBottom="10dp"
             android:text="@string/author"
             android:textSize="12sp" />
                 
     </LinearLayout>
 
-</LinearLayout>
+</ScrollView>