diff --git a/app/app.iml b/app/app.iml
index a8c8c7e..b77b354 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -32,12 +32,14 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -82,6 +84,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -89,12 +92,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/app/src/main/res/drawable/searchlist.xml b/app/src/main/res/drawable/searchlist.xml
index f613773..c75b725 100644
--- a/app/src/main/res/drawable/searchlist.xml
+++ b/app/src/main/res/drawable/searchlist.xml
@@ -7,5 +7,5 @@
         android:top="10dp"
         android:bottom="10dp"/>
     <solid android:color="#FFF"/>
-    <stroke android:width="2px" android:color="#ffffff"/>
+    <stroke android:width="20px" android:color="#ffffff"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index c8c9c21..0407c07 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -12,59 +12,47 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:orientation="horizontal"
+        <GridLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:text="@string/select_plugin"
                 android:id="@+id/search_title"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="40sp"
-                android:height="70dp"
+                android:textSize="20sp"
                 android:paddingLeft="30dp"
-                android:paddingRight="30dp"/>
+                android:paddingRight="30dp"
+                android:layout_row="0"
+                android:layout_column="0"/>
 
             <Spinner
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:paddingLeft="30dp"
+                android:paddingStart="30dp"
                 android:id="@+id/search_spinner"
-                android:layout_weight="0.4"
-                android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                android:layout_row="0"
+                android:layout_column="1"/>
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/search_text"
-                android:textSize="40sp"
-                android:height="70dp"
+                android:textSize="20sp"
                 android:id="@+id/search_value_desc"
                 android:paddingLeft="30dp"
-                android:paddingRight="30dp"/>
+                android:paddingRight="30dp"
+                android:layout_row="1"
+                android:layout_column="0"/>
 
             <EditText
                 android:imeOptions="actionSearch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:id="@+id/search_text"
                 style="@android:style/Animation.InputMethod"
-                android:layout_weight="0.87"
                 android:inputType="text"
-                android:textSize="40sp"
-                android:height="70dp"
-                />
-        </LinearLayout>
+                android:textSize="22sp"
+                android:layout_row="1"
+                android:layout_column="1"
+                android:layout_width="fill_parent" />
+
+        </GridLayout>
 
         <LinearLayout
             android:orientation="horizontal"
@@ -76,14 +64,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="fill_parent"
                 android:id="@+id/searchlistView"
-                android:textAppearance="?android:attr/textAppearanceLarge"
                 android:paddingLeft="30dp"
                 android:paddingRight="30dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="20dp"
-                android:textSize="40sp"
+                android:textSize="15sp"
                 android:height="70dp"
-                android:layout_weight="1"
+                android:layout_weight="0.8"
                 android:background="@drawable/searchlist"/>
 
         </LinearLayout>
diff --git a/build.gradle b/build.gradle
index d14039d..b193299 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files