From 506b23a947be89002aadf1043eeee4b0726c2987 Mon Sep 17 00:00:00 2001
From: "chitta.rs" <chitta.rs@samsung.com>
Date: Tue, 19 Mar 2013 15:35:12 +0530
Subject: [PATCH] NABI_SE issue fixes, GUI changes

Change-Id: I3d1ce2ff068cd18ac776edcd7bef8e94d0cb7a46
---
 inc/MfBaseItemProvider.h                           |   4 +-
 inc/MfSearchPresentationModel.h                    |   7 +-
 inc/MfSubBaseSelectionForm.h                       |  10 +
 inc/MfSubFolderSelection.h                         |  11 -
 inc/MfTypes.h                                      |   5 +
 res/screen-density-xhigh/00_button_right.png       | Bin 0 -> 3092 bytes
 res/screen-density-xhigh/00_button_right_ef.png    | Bin 0 -> 3333 bytes
 res/screen-density-xhigh/U01_circle_button.png     | Bin 0 -> 7776 bytes
 .../U01_circle_button_press.png                    | Bin 0 -> 8700 bytes
 res/screen-size-normal/IDL_CATEGORY_SEARCH.xml     |   2 +-
 res/screen-size-normal/IDL_CREATE_FOLDER.xml       |   2 +-
 res/screen-size-normal/IDL_DETAIL_FORM.xml         |   2 +-
 res/screen-size-normal/IDL_EDIT.xml                |   4 +-
 res/screen-size-normal/IDL_MAIN_FORM.xml           |  22 +-
 res/screen-size-normal/IDL_ROOT_DIRECTORY.xml      |   2 +-
 res/screen-size-normal/IDL_SEARCH.xml              |   2 +-
 res/screen-size-normal/IDL_SUB_DIRECTORY.xml       |   2 +-
 .../IDL_SUB_FOLDER_FILE_SELECTION.xml              |   2 +-
 .../IDL_SUB_FOLDER_MOVE_COPY.xml                   |   2 +-
 .../IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml          |   2 +-
 .../IDL_TOP_MOST_FILE_SELECTION.xml                |   2 +-
 res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml  |   2 +-
 src/MfBaseItemProvider.cpp                         |  45 ++-
 src/MfContentListItem.cpp                          |  18 +-
 src/MfCreateFolderForm.cpp                         | 136 ++-------
 src/MfFileManageForm.cpp                           |   2 +-
 src/MfFileManageWorkerThread.cpp                   |   5 +-
 src/MfFolderEntryPresentationModel.cpp             |  40 +--
 src/MfSearchPresentationModel.cpp                  | 306 ++++++++-------------
 src/MfSplitPanelFileManageForm.cpp                 | 145 ++++------
 src/MfSplitPanelForm.cpp                           |   4 +
 src/MfSubBaseFileManageForm.cpp                    |  29 +-
 src/MfSubBaseSelectionForm.cpp                     |  43 ++-
 src/MfSubFolderMoveCopy.cpp                        |   2 +-
 src/MfSubFolderSelection.cpp                       |  34 ---
 src/MfThumbnailItemProviderAndListener.cpp         |  15 +-
 src/MfTopLevelFolderFileListForm.cpp               |  13 +-
 src/MfTypes.cpp                                    |  21 +-
 38 files changed, 406 insertions(+), 537 deletions(-)
 create mode 100644 res/screen-density-xhigh/00_button_right.png
 create mode 100644 res/screen-density-xhigh/00_button_right_ef.png
 create mode 100644 res/screen-density-xhigh/U01_circle_button.png
 create mode 100644 res/screen-density-xhigh/U01_circle_button_press.png

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 0000000000000000000000000000000000000000..fc5dbcf871cd4df49f9b84d2b03709106d7e18db
GIT binary patch
literal 3092
zcmZ9OWk3`B8pZzz5+kKUc<B-t-7z*g1%`}J31KMGC?z;V+Lx4O2r3;a=x~J6%_zwc
z(gH8@N(f3_y!U>(AI>??^L+cAPfx;i3qyJcHv|AcZ)~JzeUV0gL``|&wmbEP7eV7^
zWFH6sEz2K~fxH4v03eok5s2&8J$-|G13i8H_>B<=e!l=;kGuEX0SKAJ+Mtm(o9tSL
z3;S@>c+7KCUu!mMertFVhBZx8Qh<iZBwnC+hRv$&ioQMtPj68?d2%x58Jm?9T_R+f
zYE|H6a`dbC#Qx)@@K;`w&4=qlXCJ1tH>&rr^}|%H)O1-!3RX%Ox(Ybom9Nn~o!v{T
zGO#F!upeNeuD>G?cq&8&jv_TRuL-tNeF9`5<FwSE)jYpd_G;WY;}$&Ei460UtTiZ2
z)sz~;3SeQ$@KOLXAj4pDL~TG31#lj4b6o+~rGc~9<MnZX!5-y?lL5!)0&HYOX@H-_
zJzfuZYJlqD8;SY=B@0+ROgq)Uv^0=4w(~FoZyP`>fr+*bP}2cftN0iRKoJg{dxeBT
zz|&m7YOrgk`QutG(}v_lQ@M4TcwsgDC`W2(e=0jW89s4>F~>DlWtU4Xc`%vw&|EJ0
zC`HDvdxHQJrLkSm?wy7Z7-|Uw<zyVgZRxGgl;?u3t}AD2!&QDT0G5IxN6)07_1qW@
zN{si}OA!)<=PlZz2Zu=>b&RkNplEZ}ZqM&eH~Ph?_?elt)zxW}PPn5>zg@%`y8U*m
z-Rb>bk(wum2VXxe3rES{j54G+`r1CYZ&q@3IGyIH>)d*Z;YkDS`3dj1V5hMw9wo`T
zV#VyAte5v}PrgJj0iG_=B{Ft?XL(WTm|S~N3B0|hO%|ReU4GMz{HLiH6Dp{6`4E8J
zCf~L%;?(3A&*-J$;PdY~r-nr$0OMht?hn8%Jz*JSf4xo*H2``=QIc<UdG^~lrCKSk
zwq2fUqdjp}ehL@vY=<+!A$KrW1DqwQpTNaqhu-o^Izzv}cokc%JYzHb7-ZUQKQd_f
zG5&U;E^HHTj-sK^?WJaM5txl9b4^4EB~x?c#vBQ>8Bs7N3G?^Gvsww7rYRZ8Stla-
zZH;($wE`}w#W@)?rfKv7`6nl_&4zN%qw1`*zR-O@;LBCGpBlWR9k~-EmzTm`ls^*i
zo?Gjga`DDUl_%qDiZ-H0w)Gn)l|tuzS()w*_&Zf8nhdvrcY@V)Ro&cgZ&Z^vB^<a7
zzYC^dj?!<XQKkrn^Skir8llWk7Sl%M{8xn)ugub@(2zg1Y8MmCC^vmC+IZzxC#S2t
zTpY?sN@$Wfg$2qK9*^i$5oS(6$cy1qFB!jkjT~bhGZ^!+7TT1m$X7Jt7Ru<Gz2j9!
zrS@Ek|5|U%Dt5JFRbiE9RbbZ<f^~)Yzdo{A7Ps!dXTr6{w5GU5>7FC6Yx^qCdcM3E
zc||G30bWy#vwmY0SI(mNAWv;5n%&s6q~>MjIJYN<=i%Kq-+~&i%xCghWRKX54Qv{I
z%l<~bA52Fd%NE@ej~3_3=cM99a|Lt0$uTSC8c*WtLCUJgZRc#{GUoc)q9k#WkJ!@s
zA(<wbqM1CBP-I1AY2`vCt?i!e05YZGmQ6&hfvtkgN(IfAtSZ||?DcIM9vgIpMtNK%
zy4)A3^E%T0G=b8-!>q#+@!G2B-R+g;Zhl%fuKExu0WbQh*auNcoucoCW*$A1Y|1(1
zZA#LrtSDAPD3~bN)m!g9_t2qQ$?-ob2(qBr5HHK#i%eW#{VuUA!BeVehL>}9@~X_r
z&O%igRasRTZnr4c?v!CmTlAakkE0lLdrZWf#0=3Xgv;0sn;Dz=GDsP_xt97ttxTm?
z2~Tm8Uhrq1GEz?Ar(2jpGvBg>(3XwgS0kXO$W!m%We0|ID9U;|VM-z$fm5?f$=_F#
z7urMoVTHKa0Yj9yWV&Q8Jx#-pYQCB<_}hT-+1+lZ72y@{Ztw0_qLiWnqNe6s=A=Ap
zb9|{psfL+`S<lem(95C8T%~+1xheUL{Ehsn{KW=mhY$xTTsiKeyK&vBL#aIp*X$GH
zpk`l!vURvwZ%~7+5t(eNX)3!?hPTMDs4AR9cf9?9>%&zvaJ^ldrX<$lym1jOXjcw&
zLsxAFDWfGLqA}v{Q!Og`xEY2jUI*UD!1n>H>NnIE@(2YaortdetW78yHOw?Tt+0Y)
z8Ib6_i?zugH$-!w@qy8M@kt4$PX=VNwPo^oy61aaR!xEq{BJIWjU8a~>+{=p%874C
z%A~ubxVaaDiZ3Jz?G*w?I(iXbt=2|$XkTQ?dM#E*S|Ti?&>uF0pl;AKyPB!D4JE;q
zhc4eaw0~*`yjam*(NtNGU$DPDsM6Zd+c03+;ahk+W)bmN=={!k*!d_Z!-$Zf$rGY<
zqZ}_CAB8;<_?)bxPIUiSH?yPrtO&2mrknDl=E+)HjeuwGKdChWhZ{MBG{RkmnCp?>
zCP%1T)?Jc1BI(3p;$rM#b&~z!QQV_)*-F8qbBMr2z2ACSdJFkzIZL%S(k4oh+Lbc*
zG-p*B6&rQBWjyQ$Cs0_F@qN>)YBG|w%0Bl$EuQS`#Vuo(X;;EIa-h98{X&Zg?fWrh
z>=iQ1QtDYSvv>>D=l{}Wk}PL`CbG*CERqZfZRc%A3qnVgN8_gvPLg~UyGD}cVd?**
zH7kV*cPW%et>K@FRirkX(VNZZs~588J>>V6*HUkhi%w5V^@mpqm}lV7Tj+I<hXd8_
zF?DBMK1mHwzD%k<ulm&L%l6U`9K7@!(m{MmlBy2vZs+lND4}01tE%wY(9U3eKQUFM
z;QNd79p-lCrF2|Ltf`$eFKWG|`kq>yrhh0Avch)xTI>zVYR!*{I7#mb%c>o_?Api{
z(J*tbs9SCQPuf0^d2Q3$Le^p;w&$jHZd#(C_KP1}e#c^YwAm68YgvgL*=&!e#pgoS
zc;bBfKj+Rpe_v76iN7=KG3K$kz93!b$dFZ;y`IhBLq9Y7o__Jh`<;WI`b22<kT|g^
z8i&BY`mFh}*}bffFr=Y_e2v^k{zfX3#^yh`Oda`*l6b<Ke=7bnL3C_BJk{>|M6@Nd
zHJ|X9a6dLau0PbNO{m;F$~yMGS!3btztclLMt({q#DJT^f0^JN(?VLOOkUeIWa#<p
z(;4=Aur$3gz3txx-OECLdZDYEhct_aeDvzG51)lsFHw#E^^h0M3%v)=+s!k`x5+zp
zbaiaB9Mm42+*$}bF(m%QSfHqBA8N9P?7KU=`D8o;y*vC2n~9Bxl=(I1Oniw8-*6)=
z-edIr-pCZRG^T%^w4u?gL2%mr7_?hQTw}5OXqWd!{kHd3(3a*|#<*oqQ$bT+E#Aos
zPYP@K5bklf$y2C8nBQ*+{lR`dIZ>#lHQ%xq=6l$6c(BMm9~mHaN*HLG2^J&OG+Q>`
z-iPhz&LHOFCUhLn=BB^TJ-*i(T(mbjXLv{%6Fq#Ec96n|xSW!kG7w82yIrWNt){lD
z6L7kDQid45Gb~!jarW|Tpq7Ij8hJFaJw+JJ87<D<&CdAj{ix)0t96^}4Y9kuo9|O!
zh=Sa${Ts(SZNYQFyx(6fGFq-a;(siD?)mH8fz3$SaRygL#yJIf&fbZef;92s-{f~Q
zvNi`GOauT-GyuQOFLD!r2eJTcIRl`c0|19_`t2?Q0LXNV^>mRTv;Pov>DysUF-r{;
zWJa({?5UXO8<!xdfWd)Q97w1ZF~oKR2ujg#tSg;BH{HXh*G+>pGH@b-db9R0zyt$i
z6n{()T%zX3{Ku&Od#mr2fAI6A#hAlb`N)v9xL^Q7*AMsCrcGIlhQ{IksC}R1Tg7Qw
z<sM-Q%9`1{u=JmQ`(JylS=9JEEco?Y&k0@X?lym*a0+~sv#%^&S%3GQ5?$I!*t^8{
zffX5vJ7OVhuAT++l0m17KA${=Hm6lJ&LBN3<;zaOHQcJF=OkSZ)myMwRc%<QDj%#{
z^%rbi6%SKr?UQCrB9T;QU`xpvEmY<gQ}Bqv*b;t_0KrN%@ttwxyVXPf4+seU5AuSP
gq6oTo(ewE^Iba~k?G*5ZdS9%-Sl>dg7ViAy-<|xY@&Et;

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..d880257a0e5aa81154c8d1c57c42a6f4366a1db0
GIT binary patch
literal 3333
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
P00000NkvXXu0mjf#LyxO

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..39ba6fd5a47b0e64ed06fdf44e07d90f1d95a8dd
GIT binary patch
literal 7776
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

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..cb1264129be5da5a15716f26b86ffc8aff0bfba3
GIT binary patch
literal 8700
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

literal 0
HcmV?d00001

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;
 
-- 
2.7.4