diff --git a/apps/app/ui-tests-app/list-view/images-template.ts b/apps/app/ui-tests-app/list-view/images-template.ts
index 8a29e6137..e55748226 100644
--- a/apps/app/ui-tests-app/list-view/images-template.ts
+++ b/apps/app/ui-tests-app/list-view/images-template.ts
@@ -7,10 +7,8 @@ export function navigatingTo(args: EventData) {
 }
 
 export class ImagesTemplateViewModel extends Observable {
-
-    public items: Array<string> = ["res://icon", null, "~/ui-tests-app/resources/images/no-image.png", null, "~/ui-tests-app/resources/images/git no-image.png", null, "res://icon", null];
+    public items: Array<string> = ["res://icon", null, "~/ui-tests-app/resources/images/no-image.png", null, "~/ui-tests-app/resources/images/no-image.png", null, "res://icon", null];
     constructor() {
         super();
-
     }
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/mainPage.xml b/apps/app/ui-tests-app/mainPage.xml
index 882bbe9d9..868bac842 100644
--- a/apps/app/ui-tests-app/mainPage.xml
+++ b/apps/app/ui-tests-app/mainPage.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page loaded="pageLoaded">
   <GridLayout rows="auto, *">
-    <StackLayout id="parentLayout">
+    <StackLayout id="parentLayout" row="0" >
       <TextView automationText="tv" id="textView" text="{{ exampleName }}" />
       <Button automationText="Run" id="btnRun" text="Run" tap="{{ loadExmaple }}" />
     </StackLayout>
     <ScrollView row="1">
       <WrapLayout id="wrapLayoutWithExamples"/>
     </ScrollView>
-    <ListView items="{{ allExamples }}" row="1" itemTap="{{ loadExampleFromListView }}" id="allExamplesListView">
-        <ListView.itemTemplate>
-        <GridLayout columns="*,*">
-            <Label text="{{ name }}" />
-            <Label text="{{ path }}" col="1"/>           
+    <ListView items="{{ allExamples }}" row="1" itemTap="{{ loadExampleFromListView }}" id="allExamplesListView" >
+      <ListView.itemTemplate>
+        <GridLayout columns="*,2*" >
+          <Label text="{{ name }}" />
+          <Label text="{{ path }}" textWrap="true" col="1"/>
         </GridLayout>
-        </ListView.itemTemplate>
+      </ListView.itemTemplate>
     </ListView>
   </GridLayout>
 </Page> 
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/search-bar/issue-4147.ts b/apps/app/ui-tests-app/search-bar/issue-4147.ts
new file mode 100644
index 000000000..be5820759
--- /dev/null
+++ b/apps/app/ui-tests-app/search-bar/issue-4147.ts
@@ -0,0 +1,5 @@
+import * as frame from "tns-core-modules/ui/frame";
+
+export function onNavBtnTap(args) {
+    frame.topmost().goBack();
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/search-bar/issue-4147.xml b/apps/app/ui-tests-app/search-bar/issue-4147.xml
index c5a349675..7f6e9e2d6 100644
--- a/apps/app/ui-tests-app/search-bar/issue-4147.xml
+++ b/apps/app/ui-tests-app/search-bar/issue-4147.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page >
+    <Page.actionBar>
+        <ActionBar title="Searchbar">
+            <NavigationButton text="Go Back" android.systemIcon="ic_menu_back" tap="onNavBtnTap"/>
+        </ActionBar>
+    </Page.actionBar>
     <StackLayout>
         <SearchBar id="bg-color" hint="bg-color" text="" textFieldHintColor="green" />
         <SearchBar class="color" hint="color" text="color" />
-        <SearchBar hint="Hint Text" id="searchBar" textFieldHintColor="#FFFFFF" 
-        style="color:#FFFFFF;background-color: #795548;height:60" />
+        <SearchBar hint="Hint Text" id="searchBar" textFieldHintColor="#FFFFFF" style="color:#FFFFFF;background-color: #795548;height:60" />
     </StackLayout>
 </Page>
\ No newline at end of file