From: chitta.rs <chitta.rs@samsung.com>
Date: Tue, 19 Mar 2013 10:05:12 +0000 (+0530)
Subject: NABI_SE issue fixes, GUI changes
X-Git-Tag: accepted/tizen_2.1/20130425.024242~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=506b23a947be89002aadf1043eeee4b0726c2987;p=apps%2Fosp%2FMyFiles.git

NABI_SE issue fixes, GUI changes

Change-Id: I3d1ce2ff068cd18ac776edcd7bef8e94d0cb7a46
---

diff --git a/inc/MfBaseItemProvider.h b/inc/MfBaseItemProvider.h
index 3e3d509..6ff3cf6 100644
--- a/inc/MfBaseItemProvider.h
+++ b/inc/MfBaseItemProvider.h
@@ -158,8 +158,8 @@ private:
 
 	Tizen::Graphics::Bitmap* __pDummyImage;
 	Tizen::Graphics::Bitmap* __pFolderBitmap;
-	Tizen::Graphics::Bitmap* __pRenameBitmap;
-	Tizen::Graphics::Bitmap* __pRenamePressed;
+	Tizen::Graphics::Bitmap* __pSecondaryBitmap;
+	Tizen::Graphics::Bitmap* __pSecondaryBitmapPressed;
 
 	Tizen::Ui::Controls::ListContextItem* __pItemContext;
 };
diff --git a/inc/MfSearchPresentationModel.h b/inc/MfSearchPresentationModel.h
index 3d8a084..8bec894 100644
--- a/inc/MfSearchPresentationModel.h
+++ b/inc/MfSearchPresentationModel.h
@@ -25,6 +25,7 @@
 
 #include <FApp.h>
 #include <FBase.h>
+#include <FContent.h>
 #include <FIo.h>
 
 #include "MfFolderEntryEditorPresentationModel.h"
@@ -83,13 +84,14 @@ public:
 	 */
 	void StopSearch(void);
 
+	void CreateDirectoryEntryStack(void);
+
 	virtual bool OnStart(void);
 	virtual void OnStop(void);
 	virtual Tizen::Base::Object* Run(void);
 
 private:
-	result Search(void);
-	result Search(const Tizen::Base::String& path);
+	void Search(void);
 
 private:
 	bool __searchToStop;
@@ -97,6 +99,7 @@ private:
 	Tizen::Base::Collection::ArrayList* __pFolderSearchStartedMessage;
 	Tizen::Base::String __folderToSearch;
 	Tizen::Base::String __searchKeyword;
+	Tizen::Base::Collection::Stack* __pFolderEntryStack;
 
 	FolderEntryPresentationModel* __pFolderEntryPM;
 };
diff --git a/inc/MfSubBaseSelectionForm.h b/inc/MfSubBaseSelectionForm.h
index 53cba4e..a92c395 100644
--- a/inc/MfSubBaseSelectionForm.h
+++ b/inc/MfSubBaseSelectionForm.h
@@ -156,6 +156,16 @@ protected:
 	void ClearSelectedItems(Tizen::Ui::Controls::ListView& listView);
 	void ResetFooter(void);
 
+	/*
+	 * A private member function taking and returning no arguments.
+	 * @fn ShowHomeView
+	 * @brief Called during OnActionPerformed() on Home HeaderItem, m__pHomeHeaderItem, refreshes the view to the Root Media Directory
+	 * from anywhere within the form.
+	 * @param No parameters
+	 * @return Void return type
+	 */
+	void ShowHomeView(void);
+
 protected:
 	static const int IDA_BTN_ATTACH = 202;
 	static const int IDA_BTN_CANCEL = 203;
diff --git a/inc/MfSubFolderSelection.h b/inc/MfSubFolderSelection.h
index fe733e1..81f8a08 100644
--- a/inc/MfSubFolderSelection.h
+++ b/inc/MfSubFolderSelection.h
@@ -161,17 +161,6 @@ private:
 	void SetParentDisplayPath(void);
 
 	/*
-	 * A private member function taking no argument and returning no arguments.
-	 * @fn ShowHomeView
-	 * @brief Called during OnActionPerformed() on Home HeaderItem, refreshes the view to the Root Media Directory
-	 * from anywhere within the form.
-	 * @param No parameters
-	 * @return Void return type
-	 *
-	 */
-	void ShowHomeView(void);
-
-	/*
 	 * A private member function taking and returning no arguments.
 	 * @fn ShowParentDirectoryView
 	 * @brief Called during OnActionPerformed() on Up HeaderItem, refreshes the view to the
diff --git a/inc/MfTypes.h b/inc/MfTypes.h
index 9c4fbc5..d767257 100644
--- a/inc/MfTypes.h
+++ b/inc/MfTypes.h
@@ -166,6 +166,11 @@ extern const wchar_t* IDB_POPUP_CREATE_FOLDER_ICON;
 extern const wchar_t* IDB_POPUP_COPY_ICON;
 extern const wchar_t* IDB_POPUP_MOVE_ICON;
 
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_PRESSED;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED;
+
 //Offsets and Dimensions of controls
 extern const int X_DEFAULT;
 extern const int Y_DEFAULT;
diff --git a/res/screen-density-xhigh/00_button_right.png b/res/screen-density-xhigh/00_button_right.png
new file mode 100644
index 0000000..fc5dbcf
Binary files /dev/null and b/res/screen-density-xhigh/00_button_right.png differ
diff --git a/res/screen-density-xhigh/00_button_right_ef.png b/res/screen-density-xhigh/00_button_right_ef.png
new file mode 100644
index 0000000..d880257
Binary files /dev/null and b/res/screen-density-xhigh/00_button_right_ef.png differ
diff --git a/res/screen-density-xhigh/U01_circle_button.png b/res/screen-density-xhigh/U01_circle_button.png
new file mode 100644
index 0000000..39ba6fd
Binary files /dev/null and b/res/screen-density-xhigh/U01_circle_button.png differ
diff --git a/res/screen-density-xhigh/U01_circle_button_press.png b/res/screen-density-xhigh/U01_circle_button_press.png
new file mode 100644
index 0000000..cb12641
Binary files /dev/null and b/res/screen-density-xhigh/U01_circle_button_press.png differ
diff --git a/res/screen-size-normal/IDL_CATEGORY_SEARCH.xml b/res/screen-size-normal/IDL_CATEGORY_SEARCH.xml
index 9f54bf1..d8e7ee2 100644
--- a/res/screen-size-normal/IDL_CATEGORY_SEARCH.xml
+++ b/res/screen-size-normal/IDL_CATEGORY_SEARCH.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CATEGORY_SEARCH">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_CREATE_FOLDER.xml b/res/screen-size-normal/IDL_CREATE_FOLDER.xml
index e33bd4d..8cea963 100644
--- a/res/screen-size-normal/IDL_CREATE_FOLDER.xml
+++ b/res/screen-size-normal/IDL_CREATE_FOLDER.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CREATE_FOLDER">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_DETAIL_FORM.xml b/res/screen-size-normal/IDL_DETAIL_FORM.xml
index b268382..6eab0d2 100644
--- a/res/screen-size-normal/IDL_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_DETAIL_FORM.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_DETAIL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_EDIT.xml b/res/screen-size-normal/IDL_EDIT.xml
index 937164a..4e8d41b 100644
--- a/res/screen-size-normal/IDL_EDIT.xml
+++ b/res/screen-size-normal/IDL_EDIT.xml
@@ -3,10 +3,10 @@
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303111438" Dversion="20120315">
+<Scene Bversion="3.0.0.201302121659" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_MAIN_FORM.xml b/res/screen-size-normal/IDL_MAIN_FORM.xml
index 7ced1e1..e9b5933 100644
--- a/res/screen-size-normal/IDL_MAIN_FORM.xml
+++ b/res/screen-size-normal/IDL_MAIN_FORM.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MAIN_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
@@ -21,51 +21,51 @@
     <Panel id="IDC_CATEGORY_ICON_PANEL" parent="IDL_MAIN_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="680" x="20" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="192" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="680" x="300" y="0"/>
     </Panel>
     <Button id="IDC_BUTTON_IMAGES" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="16" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="294" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="16" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_VIDEOS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="146" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="434" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="146" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_SOUNDS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="276" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="574" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="276" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_DOCUMENTS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="406" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="714" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="406" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_OTHERS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="536" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="854" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="536" y="8"/>
     </Button>
     <Label id="IDC_LABEL_BACKGROUND" parent="IDC_CATEGORY_ICON_PANEL">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
         <layout height="122" mode="Portrait" width="680" x="0" y="0"/>
-        <layout height="192" mode="Landscape" width="1280" x="0" y="0"/>
+        <layout height="122" mode="Landscape" width="680" x="0" y="0"/>
     </Label>
     <ListView id="IDC_LISTVIEW_TEMP_FORM" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList="::IDS_COM_BODY_NO_FILES"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="170"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="240" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="244"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="313" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="170"/>
     </ListView>
     <IconListView id="IDC_ICONLISTVIEW_TOP_MOST_FORM" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_RIGHT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="164" itemBitmapWidth="164" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_SHADOW" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="10" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="26" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_OUTSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="10" magneticScrollSize="0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" textOfEmptyList="::IDS_COM_BODY_NO_FILES" touchAnimationEnabled="true"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="170"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="240" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1278" x="1" y="244"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="313" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="170"/>
     </IconListView>
     <Label id="IDC_LABEL_DISPLAY_PATH" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="::IDS_MF_BODY_DIRECTORY" textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="122"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="192"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="122"/>
     </Label>
 </Scene>
diff --git a/res/screen-size-normal/IDL_ROOT_DIRECTORY.xml b/res/screen-size-normal/IDL_ROOT_DIRECTORY.xml
index 9d735f7..bc82a45 100644
--- a/res/screen-size-normal/IDL_ROOT_DIRECTORY.xml
+++ b/res/screen-size-normal/IDL_ROOT_DIRECTORY.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ROOT_DIRECTORY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_SEARCH.xml b/res/screen-size-normal/IDL_SEARCH.xml
index 9a4351e..db90dd0 100644
--- a/res/screen-size-normal/IDL_SEARCH.xml
+++ b/res/screen-size-normal/IDL_SEARCH.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SEARCH">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_SUB_DIRECTORY.xml b/res/screen-size-normal/IDL_SUB_DIRECTORY.xml
index 522ef30..e7d40d7 100644
--- a/res/screen-size-normal/IDL_SUB_DIRECTORY.xml
+++ b/res/screen-size-normal/IDL_SUB_DIRECTORY.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_DIRECTORY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml b/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
index c722a96..58ca005 100644
--- a/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
+++ b/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_FOLDER_FILE_SELECTION">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_SUB_FOLDER_MOVE_COPY.xml b/res/screen-size-normal/IDL_SUB_FOLDER_MOVE_COPY.xml
index dfbda9e..9dfb220 100644
--- a/res/screen-size-normal/IDL_SUB_FOLDER_MOVE_COPY.xml
+++ b/res/screen-size-normal/IDL_SUB_FOLDER_MOVE_COPY.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_FOLDER_MOVE_COPY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml b/res/screen-size-normal/IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml
index 5cf1f87..c3a3226 100644
--- a/res/screen-size-normal/IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml
+++ b/res/screen-size-normal/IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_TOP_MOST_FILE_SELECTION.xml b/res/screen-size-normal/IDL_TOP_MOST_FILE_SELECTION.xml
index 8a501f0..64f7539 100644
--- a/res/screen-size-normal/IDL_TOP_MOST_FILE_SELECTION.xml
+++ b/res/screen-size-normal/IDL_TOP_MOST_FILE_SELECTION.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_MOST_FILE_SELECTION">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml b/res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml
index bba1888..bbbd137 100644
--- a/res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml
+++ b/res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_MOST_MOVE_COPY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
diff --git a/src/MfBaseItemProvider.cpp b/src/MfBaseItemProvider.cpp
index b48ee1b..02c6ab4 100644
--- a/src/MfBaseItemProvider.cpp
+++ b/src/MfBaseItemProvider.cpp
@@ -41,8 +41,8 @@ BaseItemProvider::BaseItemProvider(void)
 , __pFileNames(null)
 , __pDummyImage(null)
 , __pFolderBitmap(null)
-, __pRenameBitmap(null)
-, __pRenamePressed(null)
+, __pSecondaryBitmap(null)
+, __pSecondaryBitmapPressed(null)
 , __pItemContext(null)
 {
 	//empty implementation
@@ -172,14 +172,14 @@ CATCH:
 
 BaseItemProvider::~BaseItemProvider(void)
 {
-	if (__pRenameBitmap != null)
+	if (__pSecondaryBitmap != null)
 	{
-		delete __pRenameBitmap;
+		delete __pSecondaryBitmap;
 	}
 
-	if (__pRenamePressed != null)
+	if (__pSecondaryBitmapPressed != null)
 	{
-		delete __pRenamePressed;
+		delete __pSecondaryBitmapPressed;
 	}
 
 	if (__pFolderBitmap != null)
@@ -433,7 +433,7 @@ BaseItemProvider::CreateNormalListViewItem(int listItemIndex, int listItemWidth)
 
 		pCustomItem->SetTitle(filename, searchedString);
 //		pCustomItem->SetDate(creationDate);
-		pCustomItem->SetRenameBitmap(__pRenameBitmap, __pRenamePressed);
+		pCustomItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
 		pCustomItem->MakeFileManageFormListItem();
 	}
 	else if(__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
@@ -441,7 +441,7 @@ BaseItemProvider::CreateNormalListViewItem(int listItemIndex, int listItemWidth)
 		pCustomItem->SetTitle(filename, searchedText);
 		GetParentFolderPath(&fullFilePath);
 		pCustomItem->SetFilepath(fullFilePath);
-		pCustomItem->SetRenameBitmap(__pRenameBitmap, __pRenamePressed);
+		pCustomItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
 		pCustomItem->MakeSearchFormListItem();
 		if (__pItemContext != null)
 		{
@@ -592,6 +592,9 @@ BaseItemProvider::CreateDetailedListViewItem(int listItemIndex, int listItemWidt
 		{
 			pContentListItem->SetDescColor(Color::GetColor(COLOR_ID_GREY));
 		}
+
+		contentType = ContentManagerUtil::CheckContentType(imageIconPath);
+
 		if (pFileDetails->GetBitmap() == null && pFileDetails->IstDummy())
 		{
 			if (pCacheList != null && (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO))
@@ -634,6 +637,11 @@ BaseItemProvider::CreateDetailedListViewItem(int listItemIndex, int listItemWidt
 	pContentListItem->SetDescription(descriptionText);
 	pContentListItem->SetDate(creationDate);
 
+	if (__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+	{
+		pContentListItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
+	}
+
 	pContentListItem->MakeDetailedListItem();
 
 	if (__sourceInfo != CREATE_ITEM_SOURCE_SUB_FOLDER_MOVE_COPY && __sourceInfo != CREATE_ITEM_SOURCE_TOP_MOST_MOVE_COPY
@@ -658,15 +666,26 @@ BaseItemProvider::SetSourceForm(CreateItemSource sourceInfo)
 {
 	__sourceInfo = sourceInfo;
 
-	if (__sourceInfo == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+	if (__sourceInfo == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM)
+	{
+		if (__pSecondaryBitmap == null)
+		{
+			__pSecondaryBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+		}
+		if (__pSecondaryBitmapPressed == null)
+		{
+			__pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_RENAME_PRESSED_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+		}
+	}
+	else if (__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
 	{
-		if (__pRenameBitmap == null)
+		if (__pSecondaryBitmap == null)
 		{
-			__pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+			__pSecondaryBitmap = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG, IDB_CATEGORY_GO_TO_LOCATION, W_RENAME_ICON, W_RENAME_ICON);
 		}
-		if (__pRenamePressed == null)
+		if (__pSecondaryBitmapPressed == null)
 		{
-			__pRenamePressed = MfUtility::MergeBitmapN(IDB_RENAME_PRESSED_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+			__pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED, IDB_CATEGORY_GO_TO_LOCATION_PRESSED, W_RENAME_ICON, W_RENAME_ICON);
 		}
 	}
 }
diff --git a/src/MfContentListItem.cpp b/src/MfContentListItem.cpp
index 63a80f9..4389c3e 100644
--- a/src/MfContentListItem.cpp
+++ b/src/MfContentListItem.cpp
@@ -524,13 +524,21 @@ ContentListItem::CreateFormatRectangleForDetailedList(int itemHeight, int textHe
 	int h_CreationDate = H_LISTVIEW_ITEM_DESCRIPTION;
 
 	//Rename
-	int x_Rename = x_CreationDate + w_CreationDate;
-	int y_Rename = X_LISTVIEW;
-	int w_Rename = H_LISTVIEW_ITEM_DESCRIPTION;
-	int h_Rename = H_LISTVIEW_ITEM_DESCRIPTION;
+	int x_Rename = width - (W_RENAME_ICON + (2 * X_LISTVIEW));
+	int y_Rename = (itemHeight - W_RENAME_ICON) / 2;
+	int w_Rename = W_RENAME_ICON;
+	int h_Rename = W_RENAME_ICON;
 
 	__thumbnailRect.SetBounds(thumbnailX, thumbnailY, thumbnailWidth, thumbnailHeight); //right side width:20
-	__titleRect.SetBounds(x_Title, y_Title, w_Title, h_Title);
+
+	if (__pRenameBitmap != null)
+	{
+		__titleRect.SetBounds(x_Title, y_Title, w_Title - W_RENAME_ICON - X_LISTVIEW, h_Title);
+	}
+	else
+	{
+		__titleRect.SetBounds(x_Title, y_Title, w_Title, h_Title);
+	}
 	__detailedListDescriptionRect.SetBounds(x_Description, y_Description, w_Description, h_Description);
 	__detailedListDateRect.SetBounds(x_CreationDate, y_CreationDate, w_CreationDate, h_CreationDate);
 	__editRenameRect.SetBounds(x_Rename, y_Rename, w_Rename, h_Rename);
diff --git a/src/MfCreateFolderForm.cpp b/src/MfCreateFolderForm.cpp
index 7c10716..0cd72f1 100644
--- a/src/MfCreateFolderForm.cpp
+++ b/src/MfCreateFolderForm.cpp
@@ -680,113 +680,6 @@ CreateFolderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 void
 CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)
 {
-	/*AppLogDebug("Entry");
-	wchar_t currentInput;
-	wchar_t characterToCompare;
-	String currentText;
-	String specialCharacters(L"/\\?\":<>|;");
-	int specialCharCount = 0;
-	int modalResult = 0;
-	int inputLength = 0;
-
-	MessageBox messageBox;
-	ButtonItemStatus currentStatus = BUTTON_ITEM_STATUS_NORMAL;
-
-	result r = E_SUCCESS;
-
-	if (__pEditFieldFolderName != null)
-	{
-		currentText = __pEditFieldFolderName->GetText();
-
-		if (currentText.IsEmpty())
-		{
-			if (__pHeader != null)
-			{
-				__pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,false);
-				__pHeader->Invalidate(true);
-			}
-		}
-		else
-		{
-			if (__pHeader != null)
-			{
-				currentStatus = __pHeader->GetButtonStatus(BUTTON_POSITION_LEFT);
-
-				if (currentStatus == BUTTON_ITEM_STATUS_DISABLED)
-				{
-					__pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,true);
-					__pHeader->Invalidate(true);
-				}
-
-			}
-		}
-		inputLength = currentText.GetLength();
-		if (__fileExtension.GetLength() >0)
-		{
-			inputLength = inputLength + __fileExtension.GetLength() +1;
-		}
-
-		//if (inputLength == 1)
-		{
-			if (currentText.StartsWith(".", 0))
-			{
-				String invalidCharacterString;
-				AppResource::GetInstance()->GetString(L"IDS_INVALID_CHARACTER_MESSAGE", invalidCharacterString);
-				messageBox.Construct(L"", invalidCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
-				messageBox.ShowAndWait(modalResult);
-				if (__pHeader != null)
-				{
-					__pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,false);
-					__pHeader->Invalidate(true);
-				}
-				__pEditFieldFolderName->SetText("");
-				__pEditFieldFolderName->ShowKeypad();
-			}
-		}
-
-		int tempLength = 0;
-
-		if (__fileExtension.GetLength() == 0 )//folder case
-		{
-			AppLogDebug("ID_FOLDER_NAME_LENGTH_MAX - %d", inputLength);
-			tempLength = ID_FOLDER_NAME_LENGTH_MAX;
-		}
-		else//file case
-		{
-			AppLogDebug("ID_FILE_NAME_LENGTH_MAX - %d", inputLength);
-			tempLength = ID_FILE_NAME_LENGTH_MAX;
-		}
-
-		if (inputLength == tempLength)
-		{
-			String maxCharacterString;
-			AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);
-			messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
-			messageBox.ShowAndWait(modalResult);
-
-			__pEditFieldFolderName->ShowKeypad();
-			return;
-		}
-
-		r = currentText.GetCharAt(__pEditFieldFolderName->GetCursorPosition() - 1,currentInput);
-
-		for (specialCharCount = 0; specialCharCount < specialCharacters.GetLength(); specialCharCount++)
-		{
-			characterToCompare = specialCharacters[specialCharCount];
-			if (currentInput == characterToCompare)
-			{
-				String invalidCharacterString;
-				AppResource::GetInstance()->GetString(L"IDS_INVALID_CHARACTER_MESSAGE", invalidCharacterString);
-				messageBox.Construct(L"", invalidCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
-				messageBox.ShowAndWait(modalResult);
-				currentText.Remove(__pEditFieldFolderName->GetCursorPosition()-1,1);
-				__pEditFieldFolderName->SetText(currentText);
-				__pEditFieldFolderName->SetFocus();
-			}
-		}
-	}
-	return;*/
-
 	String currentInput;
 	//wchar_t characterToCompare;
 	String currentText;
@@ -864,19 +757,8 @@ CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)
 			tempLength = ID_FILE_NAME_LENGTH_MAX;
 		}
 
-		if (inputLength == tempLength)
-		{
-			String maxCharacterString;
-			AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);
-			messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
-			messageBox.ShowAndWait(modalResult);
-            __pEditFieldFolderName->SetText(L"");
-			__pEditFieldFolderName->ShowKeypad();
-			return;
-		}
-
 		textToCheck =  __pEditFieldFolderName->GetText().GetLength() - __textLength;
-		AppLogDebug("textcheck textlength %d %d",textToCheck,__textLength);
+		AppLogDebug("textcheck textlength %d %d %d",textToCheck,__textLength,__pEditFieldFolderName->GetCursorPosition());
 		r = currentText.SubString(__pEditFieldFolderName->GetCursorPosition() - textToCheck,currentInput);
 		for(int i = 0 ; i < currentInput.GetLength() ; i++)
 		{
@@ -893,6 +775,22 @@ CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)
 			}
 
 		}
+
+		inputLength = currentText.GetLength();
+		AppLogDebug("input length and temp legth is %d %d",inputLength,tempLength);
+		if (inputLength == tempLength)
+		{
+			String maxCharacterString;
+			AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);
+			messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);
+			messageBox.ShowAndWait(modalResult);
+			r = __pEditFieldFolderName->GetText().SubString(0,tempLength,currentInput);
+			__pEditFieldFolderName->SetText(currentInput);
+			__pEditFieldFolderName->ShowKeypad();
+			return;
+		}
+
+
 		__textLength = __pEditFieldFolderName->GetText().GetLength();
 	}
 	return;
diff --git a/src/MfFileManageForm.cpp b/src/MfFileManageForm.cpp
index 94384d2..bcd552b 100644
--- a/src/MfFileManageForm.cpp
+++ b/src/MfFileManageForm.cpp
@@ -223,7 +223,7 @@ FileManageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
 	SceneManager::GetInstance()->AddSceneManagerEventListener(*this);
 	_viewType = listViewDisplayType;
 
-	if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM)
+	if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM && (previousSceneId != IDSCN_SUB_DIRECTORY_MOVE_COPY_FORM && previousSceneId != IDSCN_SUB_DIRECTORY_MOVE_COPY_FORM1) )
 	{
 		pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
 		_editOrShare = pEditOrShare->ToInt();
diff --git a/src/MfFileManageWorkerThread.cpp b/src/MfFileManageWorkerThread.cpp
index 5d77516..a8bed04 100644
--- a/src/MfFileManageWorkerThread.cpp
+++ b/src/MfFileManageWorkerThread.cpp
@@ -2028,7 +2028,7 @@ FileManageWorkerThread::Copy(Tizen::Base::String& sourcePath, Tizen::Base::Strin
 		if (!IsFailed(GetLastResult()))
 		{
 			destFile.Write(byteToWrite, count);
-
+            TryCatch(r == E_SUCCESS,,"copy file failed");
 			if(!__isRenamingActive)
 			{
 				percentage = percentage + count;
@@ -2059,9 +2059,10 @@ FileManageWorkerThread::Copy(Tizen::Base::String& sourcePath, Tizen::Base::Strin
 	//percentage = size;
 	return E_SUCCESS;
 CATCH:
+    File::Remove(destPath);
 	if (byteToWrite != null)
 		free(byteToWrite);
-	return E_FAILURE;
+	return r;
 }
 
 long long int
diff --git a/src/MfFolderEntryPresentationModel.cpp b/src/MfFolderEntryPresentationModel.cpp
index ebe9826..61bd9d2 100644
--- a/src/MfFolderEntryPresentationModel.cpp
+++ b/src/MfFolderEntryPresentationModel.cpp
@@ -1282,11 +1282,12 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
 	ArrayList* pDeviceList = null;
 	DirEnumerator* pCurrentDirectoryEnum = null;
 	String* currentDirectoryPath = null;
+	String fileExtension;
 	int fileExtensionLength = 0;
 	int deviceListCount = 1;
 	ContentType contentType = CONTENT_TYPE_UNKNOWN;
 	result r = E_SUCCESS;
-
+	result fileExtensionResult = E_SUCCESS;
 
 	if (__pFolderEntries != null)
 	{
@@ -1336,6 +1337,7 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
 					DirectoryEntry* pCurrentFolderEntry = new (std::nothrow) DirectoryEntry();
 					String fullPath = *currentDirectoryPath+directoryName;
 					pCurrentFolderEntry->SetFileExtension(File::GetFileExtension(fullPath));
+					fileExtensionResult = GetLastResult();
 					fileExtensionLength = pCurrentFolderEntry->GetFileExtension().GetLength();
 					if(fileExtensionLength != 0)
 					{
@@ -1345,6 +1347,9 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
 					pCurrentFolderEntry->SetFileName(directoryName);
 					pCurrentFolderEntry->SetCheckDirectory(false);
 					contentType = ContentManagerUtil::CheckContentType(fullPath);
+					r = GetLastResult();
+					fileExtension = pCurrentFolderEntry->GetFileExtension();
+
 					if (__entryType == FILE_TYPE_ALL)
 					{
 						__pFolderEntries->Add(pCurrentFolderEntry);
@@ -1387,14 +1392,13 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
 					}
 					else if (__entryType == FILE_TYPE_DOCUMENT_TYPE)
 					{
-						if ( fullPath.EndsWith(L"pptx") || fullPath.EndsWith(L"PPTX")
-								||	fullPath.EndsWith(L"pdf") || fullPath.EndsWith(L"PDF")
-								||fullPath.EndsWith(L"doc") || fullPath.EndsWith(L"DOC")
-								|| fullPath.EndsWith(L"docx") || fullPath.EndsWith(L"DOCX")
-								||	fullPath.EndsWith(L"xls") || fullPath.EndsWith(L"XLS")
-								||fullPath.EndsWith(L"xlsx") || fullPath.EndsWith(L"XLSX")
-								|| fullPath.EndsWith(L"ppt") || fullPath.EndsWith(L"PPT")
-						)
+						if ( fileExtension.EndsWith(L"pptx") || fileExtension.EndsWith(L"PPTX")
+								||	fileExtension.EndsWith(L"pdf") || fileExtension.EndsWith(L"PDF")
+								||fileExtension.EndsWith(L"doc") || fileExtension.EndsWith(L"DOC")
+								|| fileExtension.EndsWith(L"docx") || fileExtension.EndsWith(L"DOCX")
+								||	fileExtension.EndsWith(L"xls") || fileExtension.EndsWith(L"XLS")
+								||fileExtension.EndsWith(L"xlsx") || fileExtension.EndsWith(L"XLSX")
+								|| fileExtension.EndsWith(L"ppt") || fileExtension.EndsWith(L"PPT"))
 						{
 							__pFolderEntries->Add(pCurrentFolderEntry);
 						}
@@ -1406,16 +1410,16 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
 					}
 					else if (__entryType == FILE_TYPE_OTHER_TYPE)
 					{
-						if (contentType == CONTENT_TYPE_OTHER)
+						if (contentType == CONTENT_TYPE_OTHER || r != E_SUCCESS)
 						{
-							if ( fullPath.EndsWith(L"pptx") || fullPath.EndsWith(L"PPTX")
-									||	fullPath.EndsWith(L"pdf") || fullPath.EndsWith(L"PDF")
-									||fullPath.EndsWith(L"doc") || fullPath.EndsWith(L"DOC")
-									|| fullPath.EndsWith(L"docx") || fullPath.EndsWith(L"DOCX")
-									||	fullPath.EndsWith(L"xls") || fullPath.EndsWith(L"XLS")
-									||fullPath.EndsWith(L"xlsx") || fullPath.EndsWith(L"XLSX")
-									|| fullPath.EndsWith(L"ppt") || fullPath.EndsWith(L"PPT")
-							)
+							if ((fileExtension.EndsWith(L"pptx") || fileExtension.EndsWith(L"PPTX")
+								|| fileExtension.EndsWith(L"pdf") || fileExtension.EndsWith(L"PDF")
+								|| fileExtension.EndsWith(L"doc") || fileExtension.EndsWith(L"DOC")
+								|| fileExtension.EndsWith(L"docx") || fileExtension.EndsWith(L"DOCX")
+								|| fileExtension.EndsWith(L"xls") || fileExtension.EndsWith(L"XLS")
+								|| fileExtension.EndsWith(L"xlsx") || fileExtension.EndsWith(L"XLSX")
+								|| fileExtension.EndsWith(L"ppt") || fileExtension.EndsWith(L"PPT")
+							))
 							{
 								delete pCurrentFolderEntry;
 								pCurrentFolderEntry = null;
diff --git a/src/MfSearchPresentationModel.cpp b/src/MfSearchPresentationModel.cpp
index 65d2657..5d35011 100644
--- a/src/MfSearchPresentationModel.cpp
+++ b/src/MfSearchPresentationModel.cpp
@@ -25,6 +25,8 @@ using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Runtime;
+using namespace Tizen::Content;
+using namespace Tizen::Io;
 
 SearchPresentationModel::SearchPresentationModel(void)
 {
@@ -59,127 +61,126 @@ SearchPresentationModel::SetStringToSearch(const String& searchString)
 	__searchKeyword = searchString;
 }
 
-result
-SearchPresentationModel::Search(const String& folderToSearch)
-{
-	AppLogDebug("Enter:SearchPresentationModel::Search::SearchPath:%S", folderToSearch.GetPointer());
 
-	ArrayList* pDirectoryEntryList = null;
-	FolderEntryPresentationModel* pFolderEntryPM = null;
-	result r = E_SUCCESS;
+Tizen::Base::Object*
+SearchPresentationModel::Run(void)
+{
+	AppLogDebug("Enter:SearchPresentationModel::Run");
+	__searchToStop = false;
 
-	pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();
-	TryCatch(pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to listmanager");
-	pFolderEntryPM->Construct();
+	if (__folderToSearch.IsEmpty() == false)
+	{
+		Search();
+	}
+	return null;
 
-	pFolderEntryPM->SetFolderEntryPath(folderToSearch);
-	pDirectoryEntryList = pFolderEntryPM->GetFolderEntryList();
-	TryCatch(pDirectoryEntryList != null, , "SearchPresentationModel::Search::pDirectoryEntryList is null");
+}
+bool
+SearchPresentationModel::OnStart(void)
+{
+	AppLogDebug("Enter:SearchPresentationModel::OnStart");
+	return true;
+}
 
-	for (int directoryEntryCount = 0; directoryEntryCount < pDirectoryEntryList->GetCount(); directoryEntryCount++)
+void
+SearchPresentationModel::OnStop(void)
+{
+	AppLogDebug("Enter:SearchPresentationModel::OnStop");
+	result r = E_FAILURE;
+	Tizen::Base::Collection::ArrayList* pSearchCompleteMessage = null;
+	if (!IsFailed(GetLastResult()))
 	{
-		if (__searchToStop == true)
-		{
-			r = E_FAILURE;
-			break;
-		}
-		DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));
-		TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");
+		pSearchCompleteMessage = new (std::nothrow) ArrayList();
+		TryCatch(pSearchCompleteMessage != null, , "SearchPresentationModel::Run::Failed to allocate Memory to pSearchCompleteMessage");
 
-		String filename;
-		if (pdirStructure->IsDirectory() == true)
-			filename = pdirStructure->GetFileName();
-		else
-			filename = pdirStructure->GetFileName() + "." + pdirStructure->GetFileExtension();
+		r = pSearchCompleteMessage->Construct();
+		TryCatch(r == E_SUCCESS, , "SearchPresentationModel::Run::Failed to Construct pFinalListToBeSent");
 
-		if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)
-		{
-			int index = -1;
-			filename.ToLowerCase();
-			__searchKeyword.ToLowerCase();
-			filename.IndexOf(__searchKeyword, 0, index);
-			if (index >= 0)
-			{
-				//__pSubFolderSearchedResult->Add(*new (std::nothrow) DirectoryEntry(*pdirStructure));
+		pSearchCompleteMessage->Add(new (std::nothrow) Integer(ID_SEARCH_COMPLETED));
 
+		Application::GetInstance()->SendUserEvent(ID_SEARCH_COMPLETED, pSearchCompleteMessage);
 
-				ArrayList* pListToBeSent = new (std::nothrow) ArrayList();
-				if (pListToBeSent != null)
-				{
-					pListToBeSent->Construct();
-					pListToBeSent->Add(new (std::nothrow) Integer(ID_SEARCH_RESULT_FOUND));
-					pListToBeSent->Add(new (std::nothrow) DirectoryEntry(*pdirStructure));
-				}
-				AppLogDebug("Exit:SearchPresentationModel::Search::Result:%S", filename.GetPointer());
-				Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);
-			}
-		}
-		if (pdirStructure->IsDirectory() == true)
-		{
-			///Free __pListToBeSent and construct again
-			/*if (__pFolderSearchStartedMessage != null)
-			{
-			    delete __pFolderSearchStartedMessage;
-			    __pFolderSearchStartedMessage = null;
-			}*/
-			__pFolderSearchStartedMessage = new (std::nothrow) ArrayList();
-			if (__pFolderSearchStartedMessage != null)
-			{
-				__pFolderSearchStartedMessage->Construct();
-				__pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));
-				__pFolderSearchStartedMessage->Add(new (std::nothrow) String(pdirStructure->GetFullFilePath()));
-			}
-			Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);
-			Search(pdirStructure->GetFullFilePath());
-		}
 	}
-	AppLogDebug("Exit:SearchPresentationModel::Search::SearchPath:%S", folderToSearch.GetPointer());
-	return r;
+	AppLogDebug("Exit:SearchPresentationModel::OnStop");
+	return;
 
 CATCH:
-	if (pFolderEntryPM != null)
+	if (pSearchCompleteMessage)
 	{
-		delete pFolderEntryPM;
+		delete pSearchCompleteMessage;
 	}
-	return r;
+	AppLogDebug("SearchPresentationModel::OnStop--");
+	return;
+
 }
 
-result
+void
+SearchPresentationModel::StopSearch(void)
+{
+	AppLogDebug("Enter:SearchPresentationModel::StopSearch");
+	__searchToStop = true;
+}
+
+void
 SearchPresentationModel::Search(void)
 {
-	AppLogDebug("Enter:SearchPresentationModel::Search");
-	result r = E_SUCCESS;
+	String* pCurrentDirectoryPath = null;
+	ArrayList* pDirectoryEntryList = null;
+	int directoryEntryCount = 0;
+	result r = E_FAILURE;
+
+	AppLogDebug("SearchPresentationModel::Search");
+
+	__pFolderEntryStack = new (std::nothrow) Stack();
+	TryCatch(__pFolderEntryStack != null, , "Stack is null");
+
+	pCurrentDirectoryPath =  new (std::nothrow) String(__folderToSearch);
+	TryCatch(pCurrentDirectoryPath != null, , "pCurrentDirectoryPath is null");
+
+	r = __pFolderEntryStack->Push(new String(*pCurrentDirectoryPath));
+	TryCatch(r == E_SUCCESS, ,"push failed");
 
 	__pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();
-	TryCatch(__pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to __pContentManager");
+	TryCatch(__pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to __pFolderEntryPM");
 	__pFolderEntryPM->Construct();
 
-	if (__folderToSearch.IsEmpty() == false)
+	do
 	{
-		if ((__folderToSearch == BasePresentationModel::GetMediaPath()) || (__folderToSearch == BasePresentationModel::GetSdCardPath()))
+		AppLogDebug("SearchPresentationModel::Search:%S", pCurrentDirectoryPath->GetPointer());
+
+		if (__searchToStop == true)
 		{
-			ArrayList* pDirectoryEntryList = null;
-			__pFolderEntryPM->SetFolderEntryPath(__folderToSearch);
+			break;
+		}
+		__pFolderSearchStartedMessage = new (std::nothrow) ArrayList();
+		if (__pFolderSearchStartedMessage != null)
+		{
+			__pFolderSearchStartedMessage->Construct();
+			__pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));
+			__pFolderSearchStartedMessage->Add(new (std::nothrow) String(*pCurrentDirectoryPath));
+		}
+		Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);
 
-			pDirectoryEntryList = __pFolderEntryPM->GetFolderEntryList();
-			TryCatch(pDirectoryEntryList != null, , "SearchPresentationModel::Search::pDirectoryEntryList is null");
+		__pFolderEntryPM->SetFolderEntryPath(*pCurrentDirectoryPath);
+		pDirectoryEntryList = __pFolderEntryPM->GetFolderEntryList();
 
-			for (int directoryEntryCount = 0; directoryEntryCount < pDirectoryEntryList->GetCount(); directoryEntryCount++)
+		while(directoryEntryCount < pDirectoryEntryList->GetCount())
+		{
+			if (__searchToStop == true)
 			{
-				if (__searchToStop == true)
-				{
-					r = E_FAILURE;
-					break;
-				}
+				break;
+			}
+			DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));
+			TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");
 
-				DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));
-				TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");
+			if(pdirStructure->IsDirectory() == true)
+			{
+				String directoryFullPath = pdirStructure->GetFullFilePath();
+				r = __pFolderEntryStack->Push(new (std::nothrow) String(directoryFullPath));
+				TryCatch(r == E_SUCCESS, ,"push failed");
 
 				String filename;
-				if (pdirStructure->IsDirectory() == true)
-					filename = pdirStructure->GetFileName();
-				else
-					filename = pdirStructure->GetFileName() + "." + pdirStructure->GetFileExtension();
+				filename = pdirStructure->GetFileName();
 
 				if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)
 				{
@@ -201,109 +202,46 @@ SearchPresentationModel::Search(void)
 						Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);
 					}
 				}
-				if (pdirStructure->IsDirectory() == true)
+			}
+			else
+			{
+				String filename;
+				filename = pdirStructure->GetFullFilePath();
+
+				if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)
 				{
-					/*if (__pFolderSearchStartedMessage != null)
-					{
-					    delete __pFolderSearchStartedMessage;
-					    __pFolderSearchStartedMessage = null;
-					}*/
-					__pFolderSearchStartedMessage = new (std::nothrow) ArrayList();
-					if (__pFolderSearchStartedMessage != null)
+					int index = -1;
+					filename.ToLowerCase();
+					__searchKeyword.ToLowerCase();
+					filename.IndexOf(__searchKeyword, 0, index);
+					if (index >= 0)
 					{
-						__pFolderSearchStartedMessage->Construct();
-						__pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));
-						__pFolderSearchStartedMessage->Add(new (std::nothrow) String(pdirStructure->GetFullFilePath()));
+						//__pSearchedResult->Add(*new (std::nothrow) DirectoryEntry(*pdirStructure));
+						ArrayList* pListToBeSent = new (std::nothrow) ArrayList();
+						if (pListToBeSent != null)
+						{
+							pListToBeSent->Construct();
+							pListToBeSent->Add(new (std::nothrow) Integer(ID_SEARCH_RESULT_FOUND));
+							pListToBeSent->Add(new (std::nothrow) DirectoryEntry(*pdirStructure));
+						}
+						AppLogDebug("Exit:SearchPresentationModel::Search::Result:%S", filename.GetPointer());
+						Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);
 					}
-					Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);
-					r = Search(pdirStructure->GetFullFilePath());
 				}
 			}
+			directoryEntryCount++;
 		}
-		else
-		{
-			/*if (__pFolderSearchStartedMessage != null)
-			{
-			    delete __pFolderSearchStartedMessage;
-			    __pFolderSearchStartedMessage = null;
-			}*/
-			__pFolderSearchStartedMessage = new (std::nothrow) ArrayList();
-			if (__pFolderSearchStartedMessage != null)
-			{
-				__pFolderSearchStartedMessage->Construct();
-				__pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));
-				__pFolderSearchStartedMessage->Add(new (std::nothrow) String(__folderToSearch));
-			}
-			Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);
-			r = Search(__folderToSearch);
-
-		}
+		directoryEntryCount = 0;
+		pCurrentDirectoryPath = static_cast<String *>(__pFolderEntryStack->Pop());
+		TryCatch(pCurrentDirectoryPath !=null, , "Pop Failed");
 	}
-	SetLastResult(r);
-	AppLogDebug("Exit:SearchPresentationModel::Search");
-	return r;
-
-CATCH:
-	return r;
-
-}
-
-Tizen::Base::Object*
-SearchPresentationModel::Run(void)
-{
-	AppLogDebug("Enter:SearchPresentationModel::Run");
-	result r = E_FAILURE;
-	__searchToStop = false;
-
-	if (__folderToSearch.IsEmpty() == false)
-	{
-		r = Search();
-	}
-	return null;
+	while (__pFolderEntryStack->GetCount() > 0);
 
-}
-bool
-SearchPresentationModel::OnStart(void)
-{
-	AppLogDebug("Enter:SearchPresentationModel::OnStart");
-	return true;
-}
-
-void
-SearchPresentationModel::OnStop(void)
-{
-	AppLogDebug("Enter:SearchPresentationModel::OnStop");
-	result r = E_FAILURE;
-	Tizen::Base::Collection::ArrayList* pSearchCompleteMessage = null;
-	if (!IsFailed(GetLastResult()))
-	{
-		pSearchCompleteMessage = new (std::nothrow) ArrayList();
-		TryCatch(pSearchCompleteMessage != null, , "SearchPresentationModel::Run::Failed to allocate Memory to pSearchCompleteMessage");
-
-		r = pSearchCompleteMessage->Construct();
-		TryCatch(r == E_SUCCESS, , "SearchPresentationModel::Run::Failed to Construct pFinalListToBeSent");
-
-		pSearchCompleteMessage->Add(new (std::nothrow) Integer(ID_SEARCH_COMPLETED));
-
-		Application::GetInstance()->SendUserEvent(ID_SEARCH_COMPLETED, pSearchCompleteMessage);
-
-	}
-	AppLogDebug("Exit:SearchPresentationModel::OnStop");
 	return;
-
 CATCH:
-	if (pSearchCompleteMessage)
+
+	if (__pFolderEntryStack != null)
 	{
-		delete pSearchCompleteMessage;
+		__pFolderEntryStack->RemoveAll(true);
 	}
-	AppLogDebug("SearchPresentationModel::OnStop--");
-	return;
-
-}
-
-void
-SearchPresentationModel::StopSearch(void)
-{
-	AppLogDebug("Enter:SearchPresentationModel::StopSearch");
-	__searchToStop = true;
 }
diff --git a/src/MfSplitPanelFileManageForm.cpp b/src/MfSplitPanelFileManageForm.cpp
index 3e0c9eb..55cafa5 100644
--- a/src/MfSplitPanelFileManageForm.cpp
+++ b/src/MfSplitPanelFileManageForm.cpp
@@ -96,22 +96,11 @@ SplitPanelFileManageForm::OnInitializing(void)
 
 	//initialize presentation models
 	_currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
-	if (_pFolderEntryPM == null)
-	{
-		AppLogDebug("Creating new PM");
-		_pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();
-		AppAssert(_pFolderEntryPM != null);
-		r = _pFolderEntryPM->Construct();
-		AppAssert(r==E_SUCCESS);
-		_pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-	}
-	//_pFolderEntryPM->SetFolderEntryPath(_currentDirectoryPath);
-	_pFilenames = _pFolderEntryPM->GetFolderEntryList();
+
 	//initialize itemproviders
 	_pBaseItemProvider = new (std::nothrow) BaseItemProvider();
 	_pBaseItemProvider->Construct();
 	_pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-	_pBaseItemProvider->SetFolderEntryProvider(this);
 
 	//initialize pm, item provider and listner for directory tree
 	__pDirectoryTreePM = new (std::nothrow) FolderEntryPresentationModel();
@@ -149,12 +138,19 @@ SplitPanelFileManageForm::OnInitializing(void)
 	CreateFileProgressingPopup();
 	CreateDeleteConfirmationPopUp();
 
+	__pSplitPanel = new (std::nothrow) SplitPanel();
+	__pSplitPanel->Construct(clientBounds, SPLIT_PANEL_DIVIDER_STYLE_MOVABLE, SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL );
+	__pSplitPanel->AddSplitPanelEventListener(*this);
+	__pSplitPanel->SetDividerPosition(GetClientAreaBounds().width / 3);
+
+	int dividerPosition = 0;
+	dividerPosition = __pSplitPanel->GetDividerPosition();
 	//create panel
 	__pFirstPanePanel = new (std::nothrow) Panel();
-	__pFirstPanePanel->Construct(Rectangle(0,0,GetClientAreaBounds().width, GetClientAreaBounds().height), GROUP_STYLE_NONE);
+	__pFirstPanePanel->Construct(Rectangle(0,0,dividerPosition, GetClientAreaBounds().height), GROUP_STYLE_NONE);
 
 	__pSecondPanePanel = new (std::nothrow) Panel();
-	__pSecondPanePanel->Construct(Rectangle(0,0,GetClientAreaBounds().width, GetClientAreaBounds().height), GROUP_STYLE_NONE);
+	__pSecondPanePanel->Construct(Rectangle(dividerPosition + 13,0,GetClientAreaBounds().width - dividerPosition - 13, GetClientAreaBounds().height), GROUP_STYLE_NONE);
 
 	__pDirTreeListView = new (std::nothrow) ListView();
 	__pDirTreeListView->Construct(Rectangle(__pFirstPanePanel->GetBounds()), true, false);
@@ -209,10 +205,6 @@ SplitPanelFileManageForm::OnInitializing(void)
 		_pEditListView->SetShowState(false);
 	}
 
-	__pSplitPanel = new (std::nothrow) SplitPanel();
-	__pSplitPanel->Construct(clientBounds, SPLIT_PANEL_DIVIDER_STYLE_MOVABLE, SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL );
-	__pSplitPanel->AddSplitPanelEventListener(*this);
-	__pSplitPanel->SetDividerPosition(GetClientAreaBounds().width / 3);
 	__pSplitPanel->SetPane(__pFirstPanePanel, SPLIT_PANEL_PANE_ORDER_FIRST);
 	__pSplitPanel->SetPane(__pSecondPanePanel, SPLIT_PANEL_PANE_ORDER_SECOND);
 
@@ -226,8 +218,8 @@ SplitPanelFileManageForm::OnTerminating(void)
 {
 	AppLogDebug("ENTER");
 
-	delete _pFolderEntryPM;
-	_pFolderEntryPM = null;
+/*	delete _pFolderEntryPM;
+	_pFolderEntryPM = null;*/
 	RemoveFooter();
 
 	return E_SUCCESS;
@@ -276,7 +268,6 @@ SplitPanelFileManageForm::OnDividerPositionChanged(SplitPanel& source, int posit
 	int dividerPosition;
 
 	dividerPosition = source.GetDividerPosition();
-	AppLogDebug("Divider Position = %d", dividerPosition);
 
 	if (__pFirstPanePanel != null)
 	{
@@ -295,6 +286,10 @@ SplitPanelFileManageForm::OnDividerPositionChanged(SplitPanel& source, int posit
 	{
 		_pEditIconListView->SetBounds(Rectangle(0, 0, __pSecondPanePanel->GetWidth(), __pSecondPanePanel->GetHeight()));
 	}
+	if (__pDirTreeListView != null)
+	{
+		__pDirTreeListView->SetBounds(Rectangle(0, 0, __pFirstPanePanel->GetWidth(), __pFirstPanePanel->GetHeight()));
+	}
 	__pFirstPanePanel->Invalidate(true);
 	__pSecondPanePanel->Invalidate(true);
 
@@ -444,6 +439,8 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 	int listViewDisplayType = VIEW_TYPE_AS_NORMAL_LIST;
 	String viewStyleKeyName(L"ListDisplayType");
 
+	DirectoryEntry* pRootDirectory = new DirectoryEntry();
+
 	pAppResource = UiApp::App::GetInstance()->GetAppResource();
 
 	((MyFilesApp*) Application::GetInstance())->SetCurrentView(this);
@@ -456,6 +453,14 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 	{
 		_pMoreContextMenu->SetShowState(false);
 	}
+
+	pcurrentFolderEntryPM = static_cast<FolderEntryPresentationModel *>(pArgs->GetAt(1));
+	TryCatch(pcurrentFolderEntryPM != null, , "FolderEntryPM is null");
+
+	_pFolderEntryPM = pcurrentFolderEntryPM;
+	_pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
+	_pBaseItemProvider->SetFolderEntryProvider(this);
+
 	if (previousSceneId == IDSCN_SPLIT_PANEL_FORM)
 	{
 		_currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
@@ -481,72 +486,36 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 			_pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_SHARE_FORM);
 		}
 
-	_pEditListView->SetItemProvider(*_pBaseItemProvider);
-	pHeader = GetHeader();
-
-	if (pHeader != null)
-	{
-		pHeader->SetTitleText(headerText);
-		pHeader->Invalidate(true);
-	}
-	ToggleFooter();
-
+		_pEditListView->SetItemProvider(*_pBaseItemProvider);
+		pHeader = GetHeader();
 	}
-	else if (previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
+	else if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM)
 	{
-		if (pArgs != null)
-		{
-			pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
-			_editOrShare = pEditOrShare->ToInt();
+		pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
+		_editOrShare = pEditOrShare->ToInt();
 
-			if (_editOrShare == FILE_MANAGE_EDIT)
-			{
-				if (pAppResource != null)
-				{
-					pAppResource->GetString(L"IDS_MF_SK3_EDIT", headerText);
-				}
-			}
-			else
+		if (_editOrShare == FILE_MANAGE_EDIT)
+		{
+			if (pAppResource != null)
 			{
-				if (pAppResource != null)
-				{
-					pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", headerText);
-				}
+				pAppResource->GetString(L"IDS_MF_SK3_EDIT", headerText);
 			}
-			pcurrentFolderEntryPM = static_cast<FolderEntryPresentationModel *>(pArgs->GetAt(1));
 		}
-		if (pcurrentFolderEntryPM != null)
+		else
 		{
-			if (_pFolderEntryPM != null)
+			if (pAppResource != null)
 			{
-				delete _pFolderEntryPM;
-				_pFolderEntryPM = null;
+				pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", headerText);
 			}
-			_pFolderEntryPM = pcurrentFolderEntryPM;
-			_pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-			_pBaseItemProvider->SetFolderEntryProvider(this);
-		}
-
-		_pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_FILE_MANAGE_FORM);
-		_pEditListView->SetItemProvider(*_pBaseItemProvider);
-
-		pHeader = GetHeader();
-		if (pHeader != null)
-		{
-			pHeader->SetTitleText(headerText);
-			pHeader->Invalidate(true);
 		}
-		ToggleFooter();
 	}
-	else
+	_pFilenames = _pFolderEntryPM->GetFolderEntryList();
+	if (pHeader != null)
 	{
-		_currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
-		if (_pFolderEntryPM != null)
-		{
-			_pFolderEntryPM->SetFolderEntryPath(_currentDirectoryPath);
-			_pFilenames = _pFolderEntryPM->GetFolderEntryList();
-		}
+		pHeader->SetTitleText(headerText);
+		pHeader->Invalidate(true);
 	}
+	ToggleFooter();
 	//update footer
 	if (_pFilenames->GetCount() == 0)
 	{
@@ -557,7 +526,7 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 		SetFooterVisibility(1);
 	}
 	//update directorytree
-	DirectoryEntry* pRootDirectory = new DirectoryEntry();
+
 	switch (FolderNavigationPresentationModel::GetStorageType())
 	{
 	case MEMORY_TYPE_PHONE:
@@ -598,6 +567,11 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 		__pDirTreeListView->UpdateList();
 	}
 
+	if (_pEditListView != null)
+	{
+		_pEditListView->UpdateList();
+	}
+
 	_pFolderEntryPM->InitThumbnailManager();
 	__pFirstPanePanel->Invalidate(true);
 	__pSecondPanePanel->Invalidate(true);
@@ -606,13 +580,10 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
 	{
 		_pFileManager->SetFileManagingListener(this);
 	}
-/*	if (pArgs != null)
-	{
-		pArgs->RemoveAll(false);
-		delete pArgs;
-	}*/
 	AppLogDebug("EXIT");
 	return;
+	CATCH:
+	return;
 }
 
 void SplitPanelFileManageForm::ConstructDirTreeList(String rootMediaPath)
@@ -681,7 +652,7 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
 				_pFileManager->ClearCheckedList();
 			}
 		}
-		if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
+		/*if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
 		{
 		if (_pFolderEntryPM != null)
 		{
@@ -694,8 +665,8 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
 		else if (previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
 		{
 			_pFilenames = _pFolderEntryPM->GetFolderEntryList();
-		}
-
+		}*/
+		_pFilenames = _pFolderEntryPM->GetFolderEntryList();
 		if (_pLabelNumberOfItems != null)
 		{
 			_pLabelNumberOfItems->SetShowState(false);
@@ -710,8 +681,8 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
 		}
 		else
 		{
-		if (_pFolderEntryPM != null)
-		{
+			if (_pFolderEntryPM != null)
+			{
 			_pFolderEntryPM->GetFolderEntryCount(_currentDirectoryPath, _folderCount, _fileCount);
 			}
 		}
@@ -834,14 +805,12 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
 		if (_pEditIconListView != null && _pEditIconListView->IsVisible())
 		{
 			_pEditIconListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height  - H_DISPLAY_PATH_LABEL));
-
 			_pEditIconListView->Invalidate(true);
 		}
 
 		if (_pEditListView != null && _pEditListView->IsVisible())
 		{
 			_pEditListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height  - H_DISPLAY_PATH_LABEL));
-
 			_pEditListView->Invalidate(true);
 		}
 	}
@@ -850,14 +819,12 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
 		if (_pEditIconListView != null && _pEditIconListView->IsVisible())
 		{
 			_pEditIconListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height));
-
 			_pEditIconListView->Invalidate(true);
 		}
 
 		if (_pEditListView != null && _pEditListView->IsVisible())
 		{
 			_pEditListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height));
-
 			_pEditListView->Invalidate(true);
 		}
 	}
diff --git a/src/MfSplitPanelForm.cpp b/src/MfSplitPanelForm.cpp
index 810013c..261ee45 100644
--- a/src/MfSplitPanelForm.cpp
+++ b/src/MfSplitPanelForm.cpp
@@ -369,6 +369,10 @@ SplitPanelForm::OnDividerPositionChanged(SplitPanel& source, int position)
 	{
 		_pIconListView->SetBounds(Rectangle(0, 0, __pSecondPanePanel->GetWidth(), __pSecondPanePanel->GetHeight()));
 	}
+	if (__pDirTreeListView != null)
+	{
+		__pDirTreeListView->SetBounds(Rectangle(0, 0, __pFirstPanePanel->GetWidth(), __pFirstPanePanel->GetHeight()));
+	}
 	__pFirstPanePanel->Invalidate(true);
 	__pSecondPanePanel->Invalidate(true);
 
diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index 6bb3f59..a2105fd 100644
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -519,7 +519,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 {
 	AppLogDebug("Entry");
 
-	int itemcount = 0;
 	int selectedItemsCount = 0;
 	int fileCount = 0;
 	int folderCount = 0;
@@ -536,7 +535,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 		pAppResource->GetString(L"IDS_COM_BODY_SELECTED", selected);
 	}
 
-
 	_renameItemIndex = index;
 
 	if (elementId == CONTENT_LIST_ITEM_TYPE_RENAME || elementId == DETAILED_LIST_ELEMENTS_RENAME)
@@ -559,6 +557,15 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 		_renameItemIndex = INVALID_LIST_INDEX;
 	}
 
+	pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
+	TryCatch(pCheckedEntry != null,, "Failed to retieve Directory Entry from ArrayList");
+
+	if (_editOrShare == FILE_MANAGE_SHARE && pCheckedEntry->IsDirectory())
+	{
+		listView.SetItemChecked(index, false);
+		return;
+	}
+
 	if (_pLabelNumberOfItems != null)
 	{
 		_pLabelNumberOfItems->SetShowState(true);
@@ -573,7 +580,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 	}
 	else
 	{
-		pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
 		if (_editOrShare == FILE_MANAGE_SHARE)
 		{
 			if (! pCheckedEntry->IsDirectory())
@@ -688,6 +694,8 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 	AppLogDebug("Exit %s", GetErrorMessage(GetLastResult()));
 	return;
 
+	CATCH:
+	return;
 }
 
 
@@ -1043,6 +1051,15 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 
 	itemIndex = index;
 
+	pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
+	TryCatch(pCheckedEntry != null, , "Failed to retrieve the directory entry for this index.");
+
+	if (_editOrShare == FILE_MANAGE_SHARE && pCheckedEntry->IsDirectory())
+	{
+		iconListView.SetItemChecked(index, false);
+		return;
+	}
+
 	//Set ShowState of the Label Displaying Selected Count as true
 	if (_pLabelNumberOfItems != null)
 	{
@@ -1057,8 +1074,6 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 	}
 	else
 	{
-		pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
-
 		if (_editOrShare == FILE_MANAGE_SHARE)
 		{
 			if (!pCheckedEntry->IsDirectory())
@@ -1121,6 +1136,10 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 
 	AppLogDebug("Exit %s", GetErrorMessage(r));
 	return;
+
+CATCH:
+	return;
+
 }
 
 
diff --git a/src/MfSubBaseSelectionForm.cpp b/src/MfSubBaseSelectionForm.cpp
index 109c6b3..e9ffd24 100644
--- a/src/MfSubBaseSelectionForm.cpp
+++ b/src/MfSubBaseSelectionForm.cpp
@@ -709,14 +709,43 @@ SubBaseSelection::OnPlayerAudioFocusChanged (void)
 void
 SubBaseSelection::OnFormBackRequested(Form& source)
 {
-	MyFilesApp* pApp = (MyFilesApp*) Application::GetInstance();
-	((MyFilesApp*) Application::GetInstance())->SetAppControlSelected();
-	((MyFilesApp*) Application::GetInstance())->AddAppControlResult(APP_CTRL_RESULT_CANCELED);
-	if (pApp != null)
+	String currentPath;
+	String parentPath;
+	result r = E_SUCCESS;
+	SceneManager* pSceneManager = null;
+	pSceneManager = SceneManager::GetInstance();
+	currentPath = FolderNavigationPresentationModel::GetCurrentPath();
+	if (currentPath == BasePresentationModel::GetMediaPath() || currentPath == BasePresentationModel::GetSdCardPath())
 	{
-		pApp->Terminate();
+		FolderNavigationPresentationModel::SetCurrentFilePath(currentPath);
+		ShowHomeView();
 	}
-	return;
-}
+	else
+	{
+		parentPath = FolderNavigationPresentationModel::GetParentPath();
 
+		FolderNavigationPresentationModel::SetCurrentFilePath(parentPath);
+		r = pSceneManager->GoForward(ForwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);
+	}
+}
 
+void
+SubBaseSelection::ShowHomeView(void)
+{
+	SceneManager* pSceneManager = null;
+	String topMostFileSelection(L"ScnTempForm");
+	pSceneManager = SceneManager::GetInstance();
+	if (pSceneManager != null)
+	{
+		IList* pArgs = new (std::nothrow) ArrayList();
+		pArgs->Add(new (std::nothrow) Integer(APPCONTROL_STATE_SELECTED));
+		if (pSceneManager->IsSceneAlive(topMostFileSelection))
+		{
+			pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_DESTROY_OPTION_DESTROY), pArgs);
+		}
+		else
+		{
+			pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgs);
+		}
+	}
+}
diff --git a/src/MfSubFolderMoveCopy.cpp b/src/MfSubFolderMoveCopy.cpp
index c9f0b2d..6c908e0 100644
--- a/src/MfSubFolderMoveCopy.cpp
+++ b/src/MfSubFolderMoveCopy.cpp
@@ -1303,7 +1303,7 @@ SubFolderMoveCopy::OnNotificationReceived(ArrayList* pArgs)
 		String storageFull;
 		AppResource* pAppResource = null;
 		pAppResource = Application::GetInstance()->GetAppResource();
-		pAppResource->GetString("IIDS_STORAGE_FULL", storageFull);
+		pAppResource->GetString("IDS_STORAGE_FULL", storageFull);
 
 		HideFileProgressingPopup();
 		MessageBox messageBox;
diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index 81ab362..60f8de0 100644
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -702,40 +702,6 @@ CATCH:
 }
 
 void
-SubFolderSelection::ShowHomeView(void)
-{
-	SceneManager* pSceneManager = null;
-	String topMostFileSelection(L"ScnTempForm");
-
-/*	String homeRootPath;
-	homeRootPath.Append(_rootMediaPath);
-
-	while ((homeRootPath != BasePresentationModel::GetMediaPath()) && (homeRootPath != BasePresentationModel::GetSdCardPath()))
-	{
-		FolderNavigationPresentationModel::SetCurrentFilePath(homeRootPath);
-		homeRootPath.Clear();
-		homeRootPath = FolderNavigationPresentationModel::GetParentPath();
-	}
-
-	FolderNavigationPresentationModel::SetCurrentFilePath(homeRootPath);*/
-
-	pSceneManager = SceneManager::GetInstance();
-	if (pSceneManager != null)
-	{
-		IList* pArgs = new (std::nothrow) ArrayList();
-		pArgs->Add(new (std::nothrow) Integer(APPCONTROL_STATE_SELECTED));
-		if (pSceneManager->IsSceneAlive(topMostFileSelection))
-		{
-			pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_DESTROY_OPTION_DESTROY), pArgs);
-		}
-		else
-		{
-			pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgs);
-		}
-	}
-}
-
-void
 SubFolderSelection::SetParentDisplayPath(void)
 {
 	String dislayPath;
diff --git a/src/MfThumbnailItemProviderAndListener.cpp b/src/MfThumbnailItemProviderAndListener.cpp
index d52cf8a..c80e913 100644
--- a/src/MfThumbnailItemProviderAndListener.cpp
+++ b/src/MfThumbnailItemProviderAndListener.cpp
@@ -273,6 +273,8 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
 	fileName = pDirStr->GetFileName();
 	pAppRegistry->Get(__extensionKeyName, fileExtension);
 
+	cacheImagePath = pDirStr->GetFullFilePath();
+
 	if (fileExtension == __showExtension && !pDirStr->IsDirectory())
 	{
 		if (!pDirStr->GetFileExtension().IsEmpty())
@@ -358,7 +360,8 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
 	pItem = new (std::nothrow) IconListViewItem();
 	r = pItem->Construct(*pListBitmap, &fileName);
 
-	if (__pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm() == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM)
+	source = __pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm();
+	if (source == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || source == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM)
 	{
 		Bitmap* __pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
 		if (__pRenameBitmap != null)
@@ -369,13 +372,13 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
 
 	}
 
-	if (__pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm() == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+	if (source == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
 	{
-		Bitmap* __pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
-		if (__pRenameBitmap != null)
+		Bitmap* pGotoLocation = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG, IDB_CATEGORY_GO_TO_LOCATION, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
+		if (pGotoLocation != null)
 		{
-			pItem->SetOverlayBitmap(OVERLAYITEM_RENAME,__pRenameBitmap, ALIGNMENT_LEFT, ALIGNMENT_BOTTOM);
-			delete __pRenameBitmap;
+			pItem->SetOverlayBitmap(OVERLAYITEM_RENAME,pGotoLocation, ALIGNMENT_LEFT, ALIGNMENT_BOTTOM);
+			delete pGotoLocation;
 		}
 	}
 	if (pDirStr->IsDirectory() || bLoadBitmap)
diff --git a/src/MfTopLevelFolderFileListForm.cpp b/src/MfTopLevelFolderFileListForm.cpp
index dcd4885..7510aac 100644
--- a/src/MfTopLevelFolderFileListForm.cpp
+++ b/src/MfTopLevelFolderFileListForm.cpp
@@ -647,7 +647,18 @@ TopLevelFolderFileListForm::OnFormBackRequested(Form& source)
 	}
 	else
 	{
-		UiApp::GetInstance()->Terminate();
+		MyFilesApp* pApp = (MyFilesApp*) Application::GetInstance();
+
+		if (__appControlRequest)
+		{
+			((MyFilesApp*) Application::GetInstance())->SetAppControlSelected();
+			((MyFilesApp*) Application::GetInstance())->AddAppControlResult(APP_CTRL_RESULT_CANCELED);
+		}
+
+		if (pApp != null)
+		{
+			pApp->Terminate();
+		}
 		return;
 	}
 }
diff --git a/src/MfTypes.cpp b/src/MfTypes.cpp
index acc8eb6..65e8615 100644
--- a/src/MfTypes.cpp
+++ b/src/MfTypes.cpp
@@ -127,18 +127,6 @@ const wchar_t* IDB_HTML = L"U01_icon_html.png";
 const wchar_t* IDB_UNKNOWN = L"U01_icon_unkown.png";
 
 //Category Icon
-/*const wchar_t* IDB_CATEGORY_ICON_BG = L"U01_category_bg.png";
-const wchar_t* IDB_CATEGORY_ICON_BG_PRESS = L"U01_category_bg_press.png";
-const wchar_t* IDB_CATEGORY_IMAGE_ICON = L"U01_category_icon_image.png";
-const wchar_t* IDB_CATEGORY_IMAGE_ICON_PRESS = L"U01_category_icon_image_press.png";
-const wchar_t* IDB_CATEGORY_VIDEO_ICON = L"U01_category_icon_video.png";
-const wchar_t* IDB_CATEGORY_VIDEO_ICON_PRESS = L"U01_category_icon_video_press.png";
-const wchar_t* IDB_CATEGORY_SOUND_ICON = L"U01_category_icon_sound.png";
-const wchar_t* IDB_CATEGORY_SOUND_ICON_PRESS = L"U01_category_icon_sound_press.png";
-const wchar_t* IDB_CATEGORY_DOCUMENT_ICON = L"U01_category_icon_document.png";
-const wchar_t* IDB_CATEGORY_DOCUMENT_ICON_PRESS = L"U01_category_icon_document_press.png";
-const wchar_t* IDB_CATEGORY_OTHERS_ICON = L"U01_category_icon_others.png";
-const wchar_t* IDB_CATEGORY_OTHERS_ICON_PRESS = L"U01_category_icon_others_press.png";*/
 const wchar_t* IDB_POPUP_SORTBY_ICON = L"U01_popup_icon_sort_by.png";
 const wchar_t* IDB_POPUP_SEARCH_ICON = L"U01_popup_icon_Search.png";
 const wchar_t* IDB_POPUP_CREATE_FOLDER_ICON = L"U01_popup_icon_Create_folder.png";
@@ -157,6 +145,13 @@ const wchar_t* IDB_CATEGORY_DOCUMENT_ICON = L"U01_category_icon_document.png";
 const wchar_t* IDB_CATEGORY_DOCUMENT_ICON_PRESS = L"U01_category_icon_document_press.png";
 const wchar_t* IDB_CATEGORY_OTHERS_ICON = L"U01_category_icon_others.png";
 const wchar_t* IDB_CATEGORY_OTHERS_ICON_PRESS = L"U01_category_icon_others_press.png";
+
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION = L"00_button_right_ef.png";
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_PRESSED = L"00_button_right.png";
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG = L"U01_circle_button.png";
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED = L"U01_circle_button_press.png";
+
+//
 //Share Context MEnu
 const wchar_t* IDB_POPUP_MESSAGE_ICON =  L"U01_popup_icon_Message.png";
 const wchar_t* IDB_POPUP_EMAIL_ICON = L"U01_popup_icon_email.png";
@@ -197,7 +192,7 @@ const int INVALID_LIST_INDEX = -1;
 const int ENABLE_FOOTER_ITEM = 1;
 const int DISABLE_FOOTER_ITEM = 0;
 
-const int W_RENAME_ICON = 64;
+const int W_RENAME_ICON = 72;
 const int H_LISTVIEW_ITEM_TITLE = 60;
 const int H_LISTVIEW_ITEM_DESCRIPTION = 48;