diff --git a/app/build.gradle b/app/build.gradle
index f9bcdb02..ee1599bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,11 +25,11 @@ android {
         }
     }
     compileSdkVersion 25
-    buildToolsVersion "26-rc1"
+    buildToolsVersion "26.0.0-rc1"
     defaultConfig {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 25
         versionCode 210
         versionName "2.1.0"
         signingConfig signingConfigs.signing
@@ -107,12 +107,6 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
-
-    splits{
-        density{
-            enable true
-        }
-    }
 }
 
 repositories {
@@ -143,11 +137,11 @@ dependencies {
     compile "com.jakewharton:butterknife:${butterKnifeVersion}"
     compile 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1'
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.2.2'
+    compile 'io.reactivex:rxjava:1.2.3'
     compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
     compile 'com.annimon:stream:1.1.7'
     compile 'com.github.GrenderG:Toasty:1.1.3'
-    compile 'uk.co.samuelwall:material-tap-target-prompt:1.9.2'
+    compile 'com.github.JediBurrell:MaterialTapTargetPrompt:-SNAPSHOT'
     compile 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2'
     compile 'com.github.daniel-stoneuk:material-about-library:1.8.1'
     compile 'io.requery:requery:1.3.0'
diff --git a/app/src/fdroid/java/com/fastaccess/ui/base/AdActivity.java b/app/src/fdroid/java/com/fastaccess/ui/base/AdActivity.java
index 5fe3487d..59125b52 100644
--- a/app/src/fdroid/java/com/fastaccess/ui/base/AdActivity.java
+++ b/app/src/fdroid/java/com/fastaccess/ui/base/AdActivity.java
@@ -1,11 +1,9 @@
 package com.fastaccess.ui.base;
 
 import android.support.annotation.Nullable;
-import android.view.View;
 import android.widget.TextView;
 
 import com.fastaccess.R;
-import com.fastaccess.helper.PrefGetter;
 
 import net.grandcentrix.thirtyinch.TiActivity;
 import net.grandcentrix.thirtyinch.TiPresenter;
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 4e5ee647..d39ffcf0 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -47,27 +47,22 @@
     <group
         android:id="@+id/group_three"
         android:checkableBehavior="none">
-            <menu>
-
-                <item
-                    android:id="@+id/supportDev"
-                    android:icon="@drawable/ic_heart"
-                    android:title="@string/support_development"/>
-
-                <item
-                    android:id="@+id/settings"
-                    android:icon="@drawable/ic_settings"
-                    android:title="@string/settings"/>
-
-                <item
-                    android:id="@+id/about"
-                    android:icon="@drawable/ic_info"
-                    android:title="@string/about"/>
-
-                <item
-                    android:id="@+id/logout"
-                    android:icon="@drawable/ic_logout"
-                    android:title="@string/logout"/>
-            </menu>
+        <item
+            android:id="@+id/supportDev"
+            android:icon="@drawable/ic_heart"
+            android:title="@string/support_development"/>
+        <item
+            android:id="@+id/settings"
+            android:icon="@drawable/ic_settings"
+            android:title="@string/settings"/>
+        <item
+            android:id="@+id/about"
+            android:icon="@drawable/ic_info"
+            android:title="@string/about"/>
+        <item
+            android:id="@+id/logout"
+            android:icon="@drawable/ic_logout"
+            android:title="@string/logout"/>
     </group>
+
 </menu>
\ No newline at end of file