diff --git a/app/app.iml b/app/app.iml
index 2d7a8c7..33a7364 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <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" />
diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
index 61b3e93..48403c8 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -123,17 +123,21 @@ public class LiveListFragment extends OpenLPFragment {
                 R.layout.fragment_livelist, from, to) {
             public View getView(int position, View convertView, ViewGroup parent) {
                 View view = super.getView(position, convertView, parent);
-                TextView line = (TextView) view.findViewById(R.id.line);
+                // TextView line = (TextView) view.findViewById(R.id.line);
                 TextView text1 = (TextView) view.findViewById(R.id.tag);
-                text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+                if (text1 != null) {
+                    text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+                }
                 TextView text2 = (TextView) view.findViewById(R.id.liveListNormal);
-                text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
-                if (selected == position) {
-                    text2.setTypeface(null, Typeface.BOLD_ITALIC);
-                    line.setBackgroundColor(0xffffff);
-                } else{
-                    text2.setTypeface(null, Typeface.NORMAL);
-                    line.setBackgroundColor(0xffffff);
+                if (text2 != null) {
+                    text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+                    if (selected == position) {
+                        text2.setTypeface(null, Typeface.BOLD_ITALIC);
+                        // line.setBackgroundColor(0xffffff);
+                    } else {
+                        text2.setTypeface(null, Typeface.NORMAL);
+                        // line.setBackgroundColor(0xffffff);
+                    }
                 }
                 return view;
 
diff --git a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index 40e341a..f652d57 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -294,7 +294,7 @@ public class SearchFragment extends Fragment {
         Log.i(LOG_TAG, "populateListDisplay - exit");
     }
 
-    private class StableArrayAdapter extends ArrayAdapter<JSONArray> {
+    public class StableArrayAdapter extends ArrayAdapter<JSONArray> {
 
         HashMap<String, Integer> mIdMap = new HashMap<String, Integer>();
 
diff --git a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
index 0c9d67e..20400d9 100644
--- a/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/WebFragment.java
@@ -69,7 +69,7 @@ public class WebFragment extends Fragment {
         super.onDestroyView();
     }
 
-    private class webClient extends WebViewClient {
+    public class webClient extends WebViewClient {
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
             return false;
diff --git a/app/src/main/res/layout/search_result_row.xml b/app/src/main/res/layout/search_result_row.xml
index 105f166..e378e2a 100644
--- a/app/src/main/res/layout/search_result_row.xml
+++ b/app/src/main/res/layout/search_result_row.xml
@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:textStyle="bold"
         android:textColor="#000000"
-        android:textSize="40sp"
+        android:textSize="25sp"
         android:paddingTop="10dp"
         android:paddingRight="5dp"
         android:paddingLeft="5dp"