diff --git a/app/app.iml b/app/app.iml
index fe31142..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,8 +74,17 @@
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.0.0/jars" />
diff --git a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
index 2ec6b03..76810bc 100644
--- a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
+++ b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
@@ -112,7 +112,7 @@ public class SearchSelectionDialog extends OpenLPDialog {
             String request = JsonHelpers.createRequestJSON("id", text);
             String url = String.format(Api.SEARCH_PLUGIN_LIVE, plugin.toLowerCase());
             triggerTextRequest(String.format("%s%s", url, request));
-            Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_LIVE, text));
+            Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_LIVE, request));
         } catch (JsonHelpers.JSONHandlerException e) {
             e.printStackTrace();
             Toast.makeText(context, "Request Failed", Toast.LENGTH_SHORT).show();
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 ec89048..441f155 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -128,6 +128,8 @@ public class LiveListFragment extends OpenLPFragment {
                 text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
                 TextView text2 = (TextView) view.findViewById(R.id.liveListNormal);
                 text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+                Log.i(LOG_TAG, "aaa " + selected +" "+ position);
+
                 if (selected == position) {
                     text2.setTypeface(null, Typeface.BOLD_ITALIC);
                 } else{
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 c044bf9..3485a9c 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -264,7 +264,7 @@ public class SearchFragment extends Fragment {
                 String it = "";
                 try {
                     Log.i(LOG_TAG, "list.setOnItemClickListener" + item);
-                    it = (String) item.get(0);
+                    it = item.get(0).toString();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
index aecc7d3..42db064 100644
--- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
@@ -138,10 +138,10 @@ public class ServiceListFragment extends OpenLPFragment {
         }
 
         // Keys used in Hashmap
-        String[] from = {"icon", "title"};
+        String[] from = {"line","icon", "title"};
 
         // Ids of views in service_list_fragment
-        int[] to = {R.id.icon, R.id.serviceListText};
+        int[] to = {R.id.servicelistLine, R.id.icon, R.id.serviceListText};
 
         SharedPreferences prefs = context.getSharedPreferences(
                 context.getString(R.string.key_shared_preferences),
@@ -155,19 +155,27 @@ public class ServiceListFragment extends OpenLPFragment {
         // Instantiating an adapter to store each items
         ListAdapter adapter = new SimpleAdapter(getActivity().getBaseContext(), aList,
                 R.layout.fragment_service_list, 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.servicelistLine);
                 TextView text1 = (TextView) view.findViewById(R.id.serviceListText);
                 text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+                Log.i(LOG_TAG, "bbb " + selected +" "+ position);
+
                 if (selected == position) {
                     text1.setTextColor(Color.parseColor("#000000"));
                     text1.setTypeface(null, Typeface.BOLD_ITALIC);
                 } else{
                     text1.setTypeface(null, Typeface.NORMAL);
+                    line.setBackgroundColor(0xffffff);
                 }
                 return view;
             }
         };
+
         setListAdapter(adapter);
 
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
diff --git a/app/src/main/res/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml
index 1cabec9..9f13d27 100644
--- a/app/src/main/res/layout/fragment_livelist_list.xml
+++ b/app/src/main/res/layout/fragment_livelist_list.xml
@@ -10,8 +10,8 @@
         android:clickable="false"
         android:longClickable="false"
         android:background="@drawable/custom_border">
-    <View
-        android:id="@+id/line"
+    <TextView
+        android:id="@+id/liveListLine"
         android:layout_width="75sp"
         android:layout_height="wrap_content"
         android:textSize="14sp"
@@ -21,7 +21,7 @@
         android:paddingBottom="10dp"
         android:layout_weight="1"/>
     <TextView
-            android:id="@+id/tag"
+            android:id="@+id/liveListTag"
             android:layout_width="75sp"
             android:layout_height="wrap_content"
             android:textSize="14sp"
@@ -40,15 +40,4 @@
             android:paddingBottom="10dp"
             android:textStyle="normal"
             android:layout_weight="1"/>
-    <TextView
-            android:id="@+id/liveListSelected"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textColor="#000000"
-            android:textSize="14sp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold|italic"
-            android:layout_weight="1"
-            android:visibility="gone"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_service_list.xml b/app/src/main/res/layout/fragment_service_list.xml
index 1262401..56d6025 100644
--- a/app/src/main/res/layout/fragment_service_list.xml
+++ b/app/src/main/res/layout/fragment_service_list.xml
@@ -10,10 +10,22 @@
         android:clickable="false"
         android:longClickable="false"
         android:background="@drawable/custom_border">
+
+    <TextView
+        android:id="@+id/servicelistLine"
+        android:layout_width="4dp"
+        android:layout_height="36dp"
+        android:paddingTop="10dp"
+        android:paddingRight="5dp"
+        android:paddingEnd="5dp"
+        android:paddingLeft="5dp"
+        android:paddingBottom="10dp"
+        android:background="#4d7bd8"/>
+
     <ImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:paddingTop="10dp"
             android:paddingRight="5dp"
             android:paddingEnd="5dp"
diff --git a/app/src/main/res/layout/fragment_servicelist_grid.xml b/app/src/main/res/layout/fragment_servicelist_grid.xml
deleted file mode 100644
index ec42ccb..0000000
--- a/app/src/main/res/layout/fragment_servicelist_grid.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="org.openlp.android2.fragments.ServiceListFragment">
-
-    <GridView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:numColumns="2" />
-
-    <TextView
-        android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center" />
-
-</FrameLayout>