diff --git a/.travis.yml b/.travis.yml
index a4f2f49..36c6075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: android
 android:
   components:
       # The BuildTools version used by your project
-      - build-tools-22.0.1
+      - build-tools-23.0.1
       # The SDK version used to compile your project
-      - android-22
+      - android-23
       # Additional components
       - extra-android-m2repository
 
diff --git a/ChangeLogDemo/build.gradle b/ChangeLogDemo/build.gradle
index 44ac771..6a8122e 100644
--- a/ChangeLogDemo/build.gradle
+++ b/ChangeLogDemo/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
     }
@@ -42,9 +42,9 @@ dependencies {
     // ChangeLog Library
     compile project(':ChangeLogLibrary')
     // Support Libraries
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:design:22.2.0'
+    compile 'com.android.support:support-v4:23.2.0'
+    compile 'com.android.support:appcompat-v7:23.2.0'
+    compile 'com.android.support:design:23.2.0'
     //To test layout
     compile 'org.lucasr.dspec:dspec:0.1.1'
 }
diff --git a/ChangeLogDemo/src/main/AndroidManifest.xml b/ChangeLogDemo/src/main/AndroidManifest.xml
index c732252..35e1db2 100644
--- a/ChangeLogDemo/src/main/AndroidManifest.xml
+++ b/ChangeLogDemo/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="22"
+        android:targetSdkVersion="23"
         tools:overrideLibrary="org.lucasr.dspec"/>
 
     <application
diff --git a/ChangeLogDemo/src/main/res/layout-v14/demo_changelogrow_layout.xml b/ChangeLogDemo/src/main/res/layout-v14/demo_changelogrow_layout.xml
index 0b553a3..4997c10 100644
--- a/ChangeLogDemo/src/main/res/layout-v14/demo_changelogrow_layout.xml
+++ b/ChangeLogDemo/src/main/res/layout-v14/demo_changelogrow_layout.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:layout_marginLeft="12dp"
               android:orientation="vertical" >
 
diff --git a/ChangeLogDemo/src/main/res/layout/demo_changelogrow_layout.xml b/ChangeLogDemo/src/main/res/layout/demo_changelogrow_layout.xml
index 4a37ce6..4f18f37 100644
--- a/ChangeLogDemo/src/main/res/layout/demo_changelogrow_layout.xml
+++ b/ChangeLogDemo/src/main/res/layout/demo_changelogrow_layout.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:layout_marginLeft="12dp"
               android:orientation="vertical" >
 
diff --git a/ChangeLogLibrary/build.gradle b/ChangeLogLibrary/build.gradle
index 168321e..1d429d8 100644
--- a/ChangeLogLibrary/build.gradle
+++ b/ChangeLogLibrary/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
     }
@@ -22,8 +22,8 @@ android {
 }
 
 dependencies{
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:recyclerview-v7:22.2.0'
+    compile 'com.android.support:support-v4:23.2.0'
+    compile 'com.android.support:recyclerview-v7:23.2.0'
 }
 
 // Used to push in maven
diff --git a/ChangeLogLibrary/src/main/AndroidManifest.xml b/ChangeLogLibrary/src/main/AndroidManifest.xml
index 9e1aa07..42ed462 100644
--- a/ChangeLogLibrary/src/main/AndroidManifest.xml
+++ b/ChangeLogLibrary/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="it.gmariotti.changelibs">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="22" />
-
     <application/>
 
 </manifest>
diff --git a/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_layout.xml b/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_layout.xml
index a7809b2..f6c81e7 100644
--- a/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_layout.xml
+++ b/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_layout.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:layout_marginLeft="12dp"
               android:orientation="vertical" >
 
diff --git a/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_material_layout.xml b/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_material_layout.xml
index b154657..b68b93a 100644
--- a/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_material_layout.xml
+++ b/ChangeLogLibrary/src/main/res/layout-v14/changelogrow_material_layout.xml
@@ -22,7 +22,7 @@
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
               android:minHeight="@dimen/chglib_material_minHeight"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:orientation="vertical" >
 
     <LinearLayout
diff --git a/ChangeLogLibrary/src/main/res/layout/changelogrow_layout.xml b/ChangeLogLibrary/src/main/res/layout/changelogrow_layout.xml
index c5e5cd1..b7b379a 100644
--- a/ChangeLogLibrary/src/main/res/layout/changelogrow_layout.xml
+++ b/ChangeLogLibrary/src/main/res/layout/changelogrow_layout.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:layout_marginLeft="12dp"
               android:orientation="vertical" >
 
diff --git a/ChangeLogLibrary/src/main/res/layout/changelogrow_material_layout.xml b/ChangeLogLibrary/src/main/res/layout/changelogrow_material_layout.xml
index 7de796a..874793c 100644
--- a/ChangeLogLibrary/src/main/res/layout/changelogrow_material_layout.xml
+++ b/ChangeLogLibrary/src/main/res/layout/changelogrow_material_layout.xml
@@ -22,7 +22,7 @@
               android:id="@+id/chg_row"
               android:layout_width="match_parent"
               android:minHeight="@dimen/chglib_material_minHeight"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:orientation="vertical" >
 
     <LinearLayout
diff --git a/build.gradle b/build.gradle
index 1a3b1aa..7ce2a8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
@@ -15,8 +15,8 @@ def isReleaseBuild() {
 
 
 ext {
-    compileSdkVersion = 22
-    buildToolsVersion = "22.0.1"
+    compileSdkVersion = 23
+    buildToolsVersion = "23.0.1"
 }
 
 allprojects {
@@ -27,5 +27,3 @@ allprojects {
         mavenCentral()
     }
 }
-
-apply plugin: 'android-reporting'
\ No newline at end of file