diff --git a/.gitignore b/.gitignore
index 9c4de58..871edad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+/app/app.iml
+/PerformanceLab.iml
+/.idea
 .gradle
 /local.properties
 /.idea/workspace.xml
diff --git a/app/src/main/java/com/performance/ua/performancelab/CanvasApiView.java b/app/src/main/java/com/performance/ua/performancelab/CanvasApiView.java
index df5c55d..13791bb 100644
--- a/app/src/main/java/com/performance/ua/performancelab/CanvasApiView.java
+++ b/app/src/main/java/com/performance/ua/performancelab/CanvasApiView.java
@@ -34,9 +34,14 @@ protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         for (int i = 0; i < N; i++) {
             // Each card is laid out a little to the right of the previous one.
+            canvas.save();
             myPaint.setColor(Color.RED / (i + 1));
             myPaint.setStrokeWidth(10);
+            if (i < N - 1) {
+                canvas.clipRect(MARGIN + i * shift, MARGIN, MARGIN + (i + 1) * shift, SIZE);
+            }
             canvas.drawRect(MARGIN + i * shift, MARGIN, SIZE + i * shift, SIZE, myPaint);
+            canvas.restore();
         }
         // Invalidate the whole view. Doing this calls onDraw() if the view is visible.
         invalidate();
diff --git a/app/src/main/res/layout/backgrounds_item.xml b/app/src/main/res/layout/backgrounds_item.xml
index ebf443e..060ae15 100644
--- a/app/src/main/res/layout/backgrounds_item.xml
+++ b/app/src/main/res/layout/backgrounds_item.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
-    android:layout_margin="10dp">
+    android:layout_margin="10dp"
+    android:orientation="vertical">
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:id="@+id/title"
-        android:background="@android:color/white"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/backgrounds_layout.xml b/app/src/main/res/layout/backgrounds_layout.xml
index 031a411..8554d1f 100644
--- a/app/src/main/res/layout/backgrounds_layout.xml
+++ b/app/src/main/res/layout/backgrounds_layout.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/backgrounds_title"
-        android:background="@android:color/white"/>
+        android:text="@string/backgrounds_title" />
 
     <ListView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
         android:id="@+id/backgrounds_list"
-        android:background="@android:color/white"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/hierarchy_layout.xml b/app/src/main/res/layout/hierarchy_layout.xml
index 94440c0..92ff981 100644
--- a/app/src/main/res/layout/hierarchy_layout.xml
+++ b/app/src/main/res/layout/hierarchy_layout.xml
@@ -1,38 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginTop="@dimen/activity_vertical_margin">
 
-    <!-- Version 1. Uses nested LinearLayouts -->
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <ImageView
+        android:id="@+id/chat_author_avatar2"
+        android:layout_width="@dimen/avatar_dimen"
+        android:layout_height="@dimen/avatar_dimen"
+        android:layout_margin="@dimen/avatar_layout_margin"
+        android:src="@mipmap/ic_launcher" />
+
+    <TextView
+        android:id="@+id/chat_author_text2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/chat_author_avatar1"
-            android:layout_width="@dimen/avatar_dimen"
-            android:layout_height="@dimen/avatar_dimen"
-            android:layout_margin="@dimen/avatar_layout_margin"
-            android:src="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/line1_text" />
+        android:layout_toEndOf="@id/chat_author_avatar2"
+        android:text="@string/line1_text" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/line2_text" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/chat_author_linetext2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/chat_author_text2"
+        android:layout_toEndOf="@id/chat_author_avatar2"
+        android:text="@string/line2_text" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index be515a8..168f129 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 877a4b7..573c882 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip