diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 121a8a8..c7240d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,8 @@
         android:uiOptions="splitActionBarWhenNarrow">
         <activity
             android:name=".FileExplorerTabActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:configChanges="screenSize|keyboardHidden"
+            android:screenOrientation="sensor"
             android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
@@ -80,6 +81,13 @@
                 android:resource="@xml/searchable" />
         </activity>
 
+        <activity
+            android:label="@string/menu_setting"
+            android:launchMode="singleTop"
+            android:name="FileExplorerPreferenceActivity"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar" >
+        </activity>
+
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".SearchActivity" />
diff --git a/res/drawable-hdpi/arrow_down.png b/res/drawable-hdpi/arrow_down.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bottom_button_bar_normal.9.png b/res/drawable-hdpi/bottom_button_bar_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bottom_button_bar_pressed.9.png b/res/drawable-hdpi/bottom_button_bar_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/btn_bottom_last_normal.9.png b/res/drawable-hdpi/btn_bottom_last_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/btn_bottom_last_pressed.9.png b/res/drawable-hdpi/btn_bottom_last_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/btn_bottom_normal.9.png b/res/drawable-hdpi/btn_bottom_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/btn_bottom_pressed.9.png b/res/drawable-hdpi/btn_bottom_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/category_bar_apk.png b/res/drawable-hdpi/category_bar_apk.png
new file mode 100755
index 0000000..db55b4b
Binary files /dev/null and b/res/drawable-hdpi/category_bar_apk.png differ
diff --git a/res/drawable-hdpi/category_bar_document.png b/res/drawable-hdpi/category_bar_document.png
new file mode 100755
index 0000000..0f058dd
Binary files /dev/null and b/res/drawable-hdpi/category_bar_document.png differ
diff --git a/res/drawable-hdpi/category_bar_empty.png b/res/drawable-hdpi/category_bar_empty.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/category_bar_mask.9.png b/res/drawable-hdpi/category_bar_mask.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/category_bar_music.png b/res/drawable-hdpi/category_bar_music.png
new file mode 100755
index 0000000..d996cfc
Binary files /dev/null and b/res/drawable-hdpi/category_bar_music.png differ
diff --git a/res/drawable-hdpi/category_bar_other.png b/res/drawable-hdpi/category_bar_other.png
new file mode 100755
index 0000000..69a74ee
Binary files /dev/null and b/res/drawable-hdpi/category_bar_other.png differ
diff --git a/res/drawable-hdpi/category_bar_picture.png b/res/drawable-hdpi/category_bar_picture.png
new file mode 100755
index 0000000..fa88fb8
Binary files /dev/null and b/res/drawable-hdpi/category_bar_picture.png differ
diff --git a/res/drawable-hdpi/category_bar_theme.png b/res/drawable-hdpi/category_bar_theme.png
new file mode 100755
index 0000000..9010d34
Binary files /dev/null and b/res/drawable-hdpi/category_bar_theme.png differ
diff --git a/res/drawable-hdpi/category_bar_video.png b/res/drawable-hdpi/category_bar_video.png
new file mode 100755
index 0000000..6e247ab
Binary files /dev/null and b/res/drawable-hdpi/category_bar_video.png differ
diff --git a/res/drawable-hdpi/category_bar_zip.png b/res/drawable-hdpi/category_bar_zip.png
new file mode 100755
index 0000000..89d2f76
Binary files /dev/null and b/res/drawable-hdpi/category_bar_zip.png differ
diff --git a/res/drawable-hdpi/category_button_bg_left.9.png b/res/drawable-hdpi/category_button_bg_left.9.png
new file mode 100755
index 0000000..3fd9e54
Binary files /dev/null and b/res/drawable-hdpi/category_button_bg_left.9.png differ
diff --git a/res/drawable-hdpi/category_button_bg_middle.9.png b/res/drawable-hdpi/category_button_bg_middle.9.png
new file mode 100755
index 0000000..f3d277a
Binary files /dev/null and b/res/drawable-hdpi/category_button_bg_middle.9.png differ
diff --git a/res/drawable-hdpi/category_button_bg_right.9.png b/res/drawable-hdpi/category_button_bg_right.9.png
new file mode 100755
index 0000000..680e0ee
Binary files /dev/null and b/res/drawable-hdpi/category_button_bg_right.9.png differ
diff --git a/res/drawable-hdpi/category_button_bg_selected.9.png b/res/drawable-hdpi/category_button_bg_selected.9.png
new file mode 100755
index 0000000..89454cd
Binary files /dev/null and b/res/drawable-hdpi/category_button_bg_selected.9.png differ
diff --git a/res/drawable-hdpi/category_icon_apk.png b/res/drawable-hdpi/category_icon_apk.png
new file mode 100755
index 0000000..9d868e5
Binary files /dev/null and b/res/drawable-hdpi/category_icon_apk.png differ
diff --git a/res/drawable-hdpi/category_icon_document.png b/res/drawable-hdpi/category_icon_document.png
new file mode 100755
index 0000000..b54f6bc
Binary files /dev/null and b/res/drawable-hdpi/category_icon_document.png differ
diff --git a/res/drawable-hdpi/category_icon_favorite.png b/res/drawable-hdpi/category_icon_favorite.png
new file mode 100755
index 0000000..f3b75f5
Binary files /dev/null and b/res/drawable-hdpi/category_icon_favorite.png differ
diff --git a/res/drawable-hdpi/category_icon_music.png b/res/drawable-hdpi/category_icon_music.png
new file mode 100755
index 0000000..411a3e0
Binary files /dev/null and b/res/drawable-hdpi/category_icon_music.png differ
diff --git a/res/drawable-hdpi/category_icon_picture.png b/res/drawable-hdpi/category_icon_picture.png
new file mode 100755
index 0000000..d555710
Binary files /dev/null and b/res/drawable-hdpi/category_icon_picture.png differ
diff --git a/res/drawable-hdpi/category_icon_theme.png b/res/drawable-hdpi/category_icon_theme.png
new file mode 100755
index 0000000..1cf04ef
Binary files /dev/null and b/res/drawable-hdpi/category_icon_theme.png differ
diff --git a/res/drawable-hdpi/category_icon_video.png b/res/drawable-hdpi/category_icon_video.png
new file mode 100755
index 0000000..2abc409
Binary files /dev/null and b/res/drawable-hdpi/category_icon_video.png differ
diff --git a/res/drawable-hdpi/category_icon_zip.png b/res/drawable-hdpi/category_icon_zip.png
new file mode 100755
index 0000000..47106af
Binary files /dev/null and b/res/drawable-hdpi/category_icon_zip.png differ
diff --git a/res/drawable-hdpi/connect.png b/res/drawable-hdpi/connect.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/disconnect.png b/res/drawable-hdpi/disconnect.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/dropdown.9.png b/res/drawable-hdpi/dropdown.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/dropdown_icon_folder.png b/res/drawable-hdpi/dropdown_icon_folder.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/dropdown_icon_root.png b/res/drawable-hdpi/dropdown_icon_root.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/dropdown_normal.9.png b/res/drawable-hdpi/dropdown_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/dropdown_pressed.9.png b/res/drawable-hdpi/dropdown_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/empty_icon.png b/res/drawable-hdpi/empty_icon.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_default.png b/res/drawable-hdpi/file_icon_default.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_mid.png b/res/drawable-hdpi/file_icon_mid.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_mp3.png b/res/drawable-hdpi/file_icon_mp3.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_office.png b/res/drawable-hdpi/file_icon_office.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_pdf.png b/res/drawable-hdpi/file_icon_pdf.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_picture.png b/res/drawable-hdpi/file_icon_picture.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_rar.png b/res/drawable-hdpi/file_icon_rar.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_theme.png b/res/drawable-hdpi/file_icon_theme.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_txt.png b/res/drawable-hdpi/file_icon_txt.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_video.png b/res/drawable-hdpi/file_icon_video.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_wav.png b/res/drawable-hdpi/file_icon_wav.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_wma.png b/res/drawable-hdpi/file_icon_wma.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/file_icon_zip.png b/res/drawable-hdpi/file_icon_zip.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/folder.png b/res/drawable-hdpi/folder.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/folder_fav.png b/res/drawable-hdpi/folder_fav.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_delete_favorite.png b/res/drawable-hdpi/ic_menu_delete_favorite.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_new_folder.png b/res/drawable-hdpi/ic_menu_new_folder.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_select_all.png b/res/drawable-hdpi/ic_menu_select_all.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_show_sys.png b/res/drawable-hdpi/ic_menu_show_sys.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_sort.png b/res/drawable-hdpi/ic_menu_sort.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/image_icon_bg.png b/res/drawable-hdpi/image_icon_bg.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/information_bg.9.png b/res/drawable-hdpi/information_bg.9.png
new file mode 100755
index 0000000..ad7c1c4
Binary files /dev/null and b/res/drawable-hdpi/information_bg.9.png differ
diff --git a/res/drawable-hdpi/ipaddress_bg.9.png b/res/drawable-hdpi/ipaddress_bg.9.png
old mode 100644
new mode 100755
index a6f75f4..c36f0b0
Binary files a/res/drawable-hdpi/ipaddress_bg.9.png and b/res/drawable-hdpi/ipaddress_bg.9.png differ
diff --git a/res/drawable-hdpi/legend_apk.png b/res/drawable-hdpi/legend_apk.png
new file mode 100755
index 0000000..eb75ca6
Binary files /dev/null and b/res/drawable-hdpi/legend_apk.png differ
diff --git a/res/drawable-hdpi/legend_document.png b/res/drawable-hdpi/legend_document.png
new file mode 100755
index 0000000..bc58f3d
Binary files /dev/null and b/res/drawable-hdpi/legend_document.png differ
diff --git a/res/drawable-hdpi/legend_music.png b/res/drawable-hdpi/legend_music.png
new file mode 100755
index 0000000..271d995
Binary files /dev/null and b/res/drawable-hdpi/legend_music.png differ
diff --git a/res/drawable-hdpi/legend_other.png b/res/drawable-hdpi/legend_other.png
new file mode 100755
index 0000000..bafdf0f
Binary files /dev/null and b/res/drawable-hdpi/legend_other.png differ
diff --git a/res/drawable-hdpi/legend_picture.png b/res/drawable-hdpi/legend_picture.png
new file mode 100755
index 0000000..8f9ebf0
Binary files /dev/null and b/res/drawable-hdpi/legend_picture.png differ
diff --git a/res/drawable-hdpi/legend_theme.png b/res/drawable-hdpi/legend_theme.png
new file mode 100755
index 0000000..6a1b7d4
Binary files /dev/null and b/res/drawable-hdpi/legend_theme.png differ
diff --git a/res/drawable-hdpi/legend_video.png b/res/drawable-hdpi/legend_video.png
new file mode 100755
index 0000000..0ae535c
Binary files /dev/null and b/res/drawable-hdpi/legend_video.png differ
diff --git a/res/drawable-hdpi/legend_zip.png b/res/drawable-hdpi/legend_zip.png
new file mode 100755
index 0000000..bb9fbb6
Binary files /dev/null and b/res/drawable-hdpi/legend_zip.png differ
diff --git a/res/drawable-hdpi/notification.png b/res/drawable-hdpi/notification.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_bar_bg.9.png b/res/drawable-hdpi/operation_bar_bg.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_cancel.png b/res/drawable-hdpi/operation_button_cancel.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_copy.png b/res/drawable-hdpi/operation_button_copy.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_delete.png b/res/drawable-hdpi/operation_button_delete.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_info.png b/res/drawable-hdpi/operation_button_info.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_info_gray.png b/res/drawable-hdpi/operation_button_info_gray.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_move.png b/res/drawable-hdpi/operation_button_move.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_pressed.9.png b/res/drawable-hdpi/operation_button_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_selectall.png b/res/drawable-hdpi/operation_button_selectall.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/operation_button_send.png b/res/drawable-hdpi/operation_button_send.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/path_pane.9.png b/res/drawable-hdpi/path_pane.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/path_pane_pressed.9.png b/res/drawable-hdpi/path_pane_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/popup_bg.9.png b/res/drawable-hdpi/popup_bg.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/remote_button.9.png b/res/drawable-hdpi/remote_button.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/remote_button_pressed.9.png b/res/drawable-hdpi/remote_button_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/sd_card_available_icon.png b/res/drawable-hdpi/sd_card_available_icon.png
new file mode 100755
index 0000000..cfb8c03
Binary files /dev/null and b/res/drawable-hdpi/sd_card_available_icon.png differ
diff --git a/res/drawable-hdpi/sd_card_icon.png b/res/drawable-hdpi/sd_card_icon.png
new file mode 100755
index 0000000..4f566c3
Binary files /dev/null and b/res/drawable-hdpi/sd_card_icon.png differ
diff --git a/res/drawable-hdpi/sd_not_available.png b/res/drawable-hdpi/sd_not_available.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/secondary_title_background.9.png b/res/drawable-hdpi/secondary_title_background.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/stat_sys_install_complete.png b/res/drawable-hdpi/stat_sys_install_complete.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/up_level.png b/res/drawable-hdpi/up_level.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/up_level_pressed.png b/res/drawable-hdpi/up_level_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/wifi_state0.png b/res/drawable-hdpi/wifi_state0.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/wifi_state4.png b/res/drawable-hdpi/wifi_state4.png
old mode 100644
new mode 100755
diff --git a/res/drawable-land-hdpi/category_bar_apk.png b/res/drawable-land-hdpi/category_bar_apk.png
new file mode 100644
index 0000000..1d3909f
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_apk.png differ
diff --git a/res/drawable-land-hdpi/category_bar_document.png b/res/drawable-land-hdpi/category_bar_document.png
new file mode 100644
index 0000000..2c6321c
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_document.png differ
diff --git a/res/drawable-land-hdpi/category_bar_empty.png b/res/drawable-land-hdpi/category_bar_empty.png
new file mode 100644
index 0000000..e574642
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_empty.png differ
diff --git a/res/drawable-land-hdpi/category_bar_mask.9.png b/res/drawable-land-hdpi/category_bar_mask.9.png
new file mode 100644
index 0000000..0a9184e
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_mask.9.png differ
diff --git a/res/drawable-land-hdpi/category_bar_music.png b/res/drawable-land-hdpi/category_bar_music.png
new file mode 100644
index 0000000..52ccd29
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_music.png differ
diff --git a/res/drawable-land-hdpi/category_bar_other.png b/res/drawable-land-hdpi/category_bar_other.png
new file mode 100644
index 0000000..fcd0c3b
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_other.png differ
diff --git a/res/drawable-land-hdpi/category_bar_picture.png b/res/drawable-land-hdpi/category_bar_picture.png
new file mode 100644
index 0000000..aa99cbc
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_picture.png differ
diff --git a/res/drawable-land-hdpi/category_bar_theme.png b/res/drawable-land-hdpi/category_bar_theme.png
new file mode 100644
index 0000000..7ca614c
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_theme.png differ
diff --git a/res/drawable-land-hdpi/category_bar_video.png b/res/drawable-land-hdpi/category_bar_video.png
new file mode 100644
index 0000000..cca476a
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_video.png differ
diff --git a/res/drawable-land-hdpi/category_bar_zip.png b/res/drawable-land-hdpi/category_bar_zip.png
new file mode 100644
index 0000000..0236a13
Binary files /dev/null and b/res/drawable-land-hdpi/category_bar_zip.png differ
diff --git a/res/drawable-land-hdpi/category_button_bg_bottom.9.png b/res/drawable-land-hdpi/category_button_bg_bottom.9.png
new file mode 100755
index 0000000..f293ad2
Binary files /dev/null and b/res/drawable-land-hdpi/category_button_bg_bottom.9.png differ
diff --git a/res/drawable-land-hdpi/category_button_bg_selected.9.png b/res/drawable-land-hdpi/category_button_bg_selected.9.png
new file mode 100755
index 0000000..e130de4
Binary files /dev/null and b/res/drawable-land-hdpi/category_button_bg_selected.9.png differ
diff --git a/res/drawable-land-hdpi/category_button_bg_top.9.png b/res/drawable-land-hdpi/category_button_bg_top.9.png
new file mode 100755
index 0000000..501d1f9
Binary files /dev/null and b/res/drawable-land-hdpi/category_button_bg_top.9.png differ
diff --git a/res/drawable-land-hdpi/information_bg.9.png b/res/drawable-land-hdpi/information_bg.9.png
new file mode 100755
index 0000000..0a28056
Binary files /dev/null and b/res/drawable-land-hdpi/information_bg.9.png differ
diff --git a/res/drawable/bottom_button_bar.xml b/res/drawable/bottom_button_bar.xml
old mode 100644
new mode 100755
index c0daafc..5ee8c4d
--- a/res/drawable/bottom_button_bar.xml
+++ b/res/drawable/bottom_button_bar.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:state_enabled="true" android:drawable="@drawable/bottom_button_bar_pressed" />
     <item android:drawable="@drawable/bottom_button_bar_normal" />
-</selector>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/btn_bottom.xml b/res/drawable/btn_bottom.xml
old mode 100644
new mode 100755
index 5a8a3aa..3c02582
--- a/res/drawable/btn_bottom.xml
+++ b/res/drawable/btn_bottom.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/btn_bottom_pressed" />
     <item android:drawable="@drawable/btn_bottom_normal" />
-</selector>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/btn_bottom_last.xml b/res/drawable/btn_bottom_last.xml
old mode 100644
new mode 100755
index b77a005..114c731
--- a/res/drawable/btn_bottom_last.xml
+++ b/res/drawable/btn_bottom_last.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/btn_bottom_last_pressed" />
     <item android:drawable="@drawable/btn_bottom_last_normal" />
-</selector>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/category_button_bottom.xml b/res/drawable/category_button_bottom.xml
new file mode 100755
index 0000000..1891bf1
--- /dev/null
+++ b/res/drawable/category_button_bottom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:drawable="@drawable/category_button_bg_bottom" />
+</selector>
diff --git a/res/drawable/category_button_left.xml b/res/drawable/category_button_left.xml
new file mode 100755
index 0000000..46eb33d
--- /dev/null
+++ b/res/drawable/category_button_left.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:drawable="@drawable/category_button_bg_left" />
+</selector>
diff --git a/res/drawable/category_button_middle.xml b/res/drawable/category_button_middle.xml
new file mode 100755
index 0000000..50bdd03
--- /dev/null
+++ b/res/drawable/category_button_middle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:drawable="@drawable/category_button_bg_middle" />
+</selector>
diff --git a/res/drawable/category_button_right.xml b/res/drawable/category_button_right.xml
new file mode 100755
index 0000000..cf2deec
--- /dev/null
+++ b/res/drawable/category_button_right.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:drawable="@drawable/category_button_bg_right" />
+</selector>
diff --git a/res/drawable/category_button_top.xml b/res/drawable/category_button_top.xml
new file mode 100755
index 0000000..c69e2ca
--- /dev/null
+++ b/res/drawable/category_button_top.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/category_button_bg_selected" />
+    <item android:drawable="@drawable/category_button_bg_top" />
+</selector>
diff --git a/res/drawable/dropdown_item_bg.xml b/res/drawable/dropdown_item_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/operation_button_background.xml b/res/drawable/operation_button_background.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/path_pane_bg.xml b/res/drawable/path_pane_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/path_up_level.xml b/res/drawable/path_up_level.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/remote_button_bg.xml b/res/drawable/remote_button_bg.xml
old mode 100644
new mode 100755
diff --git a/res/layout-land/file_explorer_category.xml b/res/layout-land/file_explorer_category.xml
new file mode 100755
index 0000000..7272c54
--- /dev/null
+++ b/res/layout-land/file_explorer_category.xml
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/file_browse_frame"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical" >
+
+	<!-- path -->
+
+	<LinearLayout
+		android:id="@+id/navigation_bar"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/secondary_title_background"
+		android:gravity="center_vertical"
+		android:paddingLeft="10dip"
+		android:paddingRight="10dip"
+		android:visibility="gone" >
+
+		<LinearLayout
+			android:layout_width="0dip"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:gravity="center_vertical" >
+
+			<LinearLayout
+				android:id="@+id/current_path_pane"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:background="@drawable/path_pane_bg"
+				android:gravity="center_vertical"
+				android:maxWidth="300dip" >
+
+				<LinearLayout
+					android:id="@+id/current_path_scroller"
+					android:layout_width="0dip"
+					android:layout_height="wrap_content"
+					android:layout_marginRight="5dip"
+					android:layout_weight="1" >
+
+					<TextView
+						android:id="@+id/current_path_view"
+						style="?android:attr/textAppearanceMedium"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:ellipsize="start"
+						android:paddingLeft="10dip"
+						android:singleLine="true" />
+				</LinearLayout>
+
+				<ImageView
+					android:id="@+id/path_pane_arrow"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/arrow_down" />
+			</LinearLayout>
+		</LinearLayout>
+
+		<ImageView
+			android:id="@+id/path_pane_up_level"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|right"
+			android:layout_marginLeft="5dip"
+			android:src="@drawable/path_up_level" />
+	</LinearLayout>
+	<!-- end path -->
+
+	<FrameLayout
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1" >
+
+		<ListView
+			android:id="@+id/file_path_list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:footerDividersEnabled="true"
+			android:headerDividersEnabled="true"
+			android:visibility="gone" />
+
+		<ListView
+			android:id="@+id/favorite_list"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:footerDividersEnabled="true"
+			android:headerDividersEnabled="true"
+			android:visibility="gone" />
+
+		<LinearLayout
+			android:id="@+id/empty_view"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:gravity="center"
+			android:orientation="vertical"
+			android:visibility="gone" >
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/empty_icon" />
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:text="@string/no_file"
+				android:textColor="#e2e2e2"
+				android:textSize="27px" />
+		</LinearLayout>
+
+		<ScrollView
+			android:id="@+id/dropdown_navigation"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:background="@drawable/dropdown"
+			android:overScrollMode="never"
+			android:visibility="gone" >
+
+			<LinearLayout
+				android:id="@+id/dropdown_navigation_list"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical" >
+			</LinearLayout>
+		</ScrollView>
+
+		<LinearLayout
+			android:id="@+id/sd_not_available_page"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:gravity="center"
+			android:orientation="vertical"
+			android:visibility="gone" >
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="25px"
+				android:src="@drawable/sd_not_available" />
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:text="@string/enable_sd_card"
+				android:textSize="22px" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/category_page"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" >
+
+			<LinearLayout
+				android:id="@+id/category_buttons"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:orientation="vertical" >
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:layout_gravity="center"
+					android:layout_weight="1"
+					android:orientation="horizontal" >
+
+					<LinearLayout
+						android:id="@+id/category_music"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_top" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_music" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_music" />
+
+						<TextView
+							android:id="@+id/category_music_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_video"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_top" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_video" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_video" />
+
+						<TextView
+							android:id="@+id/category_video_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_picture"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_top" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_picture" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_picture" />
+
+						<TextView
+							android:id="@+id/category_picture_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_theme"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_top" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_theme" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_theme" />
+
+						<TextView
+							android:id="@+id/category_theme_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:layout_gravity="center"
+					android:layout_weight="1"
+					android:orientation="horizontal" >
+
+					<LinearLayout
+						android:id="@+id/category_document"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_bottom" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_document" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_document" />
+
+						<TextView
+							android:id="@+id/category_document_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_zip"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_bottom" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_zip" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_zip" />
+
+						<TextView
+							android:id="@+id/category_zip_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_apk"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_bottom" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_apk" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_apk" />
+
+						<TextView
+							android:id="@+id/category_apk_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/category_favorite"
+						style="@style/CategoryButtonStyle"
+						android:background="@drawable/category_button_bottom" >
+
+						<ImageView
+							style="@style/CategoryButtonIconStyle"
+							android:src="@drawable/category_icon_favorite" />
+
+						<TextView
+							style="@style/CategoryButtonTextStyle"
+							android:text="@string/category_favorite" />
+
+						<TextView
+							android:id="@+id/category_favorite_count"
+							style="@style/CategoryButtonCountTextStyle" />
+					</LinearLayout>
+				</LinearLayout>
+			</LinearLayout>
+
+			<!-- category information -->
+
+			<net.micode.fileexplorer.CategoryBar
+				android:id="@+id/category_bar"
+				android:layout_width="35px"
+				android:layout_height="match_parent"
+				android:layout_marginLeft="20dp"
+				android:layout_marginRight="5dip" >
+			</net.micode.fileexplorer.CategoryBar>
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="right"
+				android:background="@drawable/information_bg"
+				android:orientation="vertical"
+				android:paddingTop="5dip" >
+
+				<LinearLayout
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="5dip"
+					android:layout_marginLeft="20px"
+					android:orientation="vertical" >
+
+					<TextView
+						android:id="@+id/sd_card_capacity"
+						style="@style/InformationTextStyle"
+						android:drawableLeft="@drawable/sd_card_icon" />
+
+					<TextView
+						android:id="@+id/sd_card_available"
+						style="@style/InformationTextStyle"
+						android:drawableLeft="@drawable/sd_card_available_icon" />
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="20px"
+					android:orientation="vertical" >
+
+					<TextView
+						android:id="@+id/category_legend_music"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_music" />
+
+					<TextView
+						android:id="@+id/category_legend_video"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_video" />
+
+					<TextView
+						android:id="@+id/category_legend_picture"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_picture" />
+
+					<TextView
+						android:id="@+id/category_legend_theme"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_theme" />
+
+					<TextView
+						android:id="@+id/category_legend_document"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_document" />
+
+					<TextView
+						android:id="@+id/category_legend_zip"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_zip" />
+
+					<TextView
+						android:id="@+id/category_legend_apk"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_apk" />
+
+					<TextView
+						android:id="@+id/category_legend_other"
+						style="@style/CategoryLegendStyleLand"
+						android:drawableLeft="@drawable/legend_other" />
+
+					<TextView style="@style/CategoryLegendStyleLand" />
+				</LinearLayout>
+			</LinearLayout>
+		</LinearLayout>
+	</FrameLayout>
+
+	<LinearLayout
+		android:id="@+id/moving_operation_bar"
+		style="@style/BottomButtonBar"
+		android:visibility="gone" >
+
+		<Button
+			android:id="@+id/button_moving_confirm"
+			style="@style/BottomButton.Left"
+			android:text="@string/confirm" />
+
+		<Button
+			android:id="@+id/button_moving_cancel"
+			style="@style/BottomButton.Right"
+			android:text="@string/operation_cancel" />
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/category_file_browser_item.xml b/res/layout/category_file_browser_item.xml
new file mode 100755
index 0000000..5a48491
--- /dev/null
+++ b/res/layout/category_file_browser_item.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="5dip"
+    android:paddingBottom="5dip"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center"
+        android:gravity="center">
+        <ImageView
+            android:id="@+id/file_image_frame"
+            android:layout_width="65px"
+            android:layout_height="65px"
+            android:scaleType="centerInside"
+            android:gravity="center"
+            android:background="@drawable/image_icon_bg"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+        <ImageView
+            android:id="@+id/file_image"
+            android:layout_width="59px"
+            android:layout_height="59px"
+            android:scaleType="centerInside"
+            android:gravity="center"
+            android:layout_gravity="center" />
+    </FrameLayout>
+    <LinearLayout
+        android:id="@+id/file_info_layout"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="5dip">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/file_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+            <TextView
+                android:id="@+id/file_count"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/modified_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:gravity="left"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+            <TextView
+                android:id="@+id/file_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginLeft="14px"
+                android:gravity="left"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/category_file_checkbox_area"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:paddingLeft="10dip">
+
+        <ImageView
+            android:id="@+id/file_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitCenter"
+            android:gravity="center"
+            android:layout_gravity="center" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/dropdown_item.xml b/res/layout/dropdown_item.xml
old mode 100644
new mode 100755
diff --git a/res/layout/favorite_item.xml b/res/layout/favorite_item.xml
old mode 100644
new mode 100755
index fdf4b73..8bdacd6
--- a/res/layout/favorite_item.xml
+++ b/res/layout/favorite_item.xml
@@ -4,6 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
+    android:paddingTop="5dip"
+    android:paddingBottom="5dip"
     android:gravity="center_vertical">
 
     <FrameLayout
@@ -31,24 +33,18 @@
     <LinearLayout
         android:id="@+id/file_info_layout"
         android:layout_width="0dip"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="1"
-        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical"
         android:orientation="vertical"
         android:paddingLeft="5dip">
 
-        <LinearLayout
-            android:layout_width="fill_parent"
+        <TextView
+            android:id="@+id/file_name"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/file_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-        </LinearLayout>
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <LinearLayout
             android:layout_width="fill_parent"
diff --git a/res/layout/file_browse_item.xml b/res/layout/file_browser_item.xml
old mode 100644
new mode 100755
similarity index 96%
rename from res/layout/file_browse_item.xml
rename to res/layout/file_browser_item.xml
index 4a4ad96..e966756
--- a/res/layout/file_browse_item.xml
+++ b/res/layout/file_browser_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<net.micode.fileexplorer.FileListItem    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="5dip"
@@ -100,4 +101,4 @@
 
     </FrameLayout>
 
-</net.micode.fileexplorer.FileListItem>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/file_explorer_category.xml b/res/layout/file_explorer_category.xml
new file mode 100755
index 0000000..7c7f8d9
--- /dev/null
+++ b/res/layout/file_explorer_category.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/file_browse_frame" android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <!-- path -->
+    <LinearLayout android:id="@+id/navigation_bar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:background="@drawable/secondary_title_background"
+        android:visibility="gone"
+        android:paddingLeft="10dip"
+        android:paddingRight="10dip">
+        <LinearLayout android:layout_width="0dip"
+            android:layout_weight="1" android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <LinearLayout android:id="@+id/current_path_pane"
+                android:background="@drawable/path_pane_bg"
+                android:layout_width="fill_parent" android:maxWidth="300dip"
+                android:gravity="center_vertical" android:layout_height="wrap_content">
+                <LinearLayout android:id="@+id/current_path_scroller"
+                    android:layout_width="0dip" android:layout_weight="1"
+                    android:layout_marginRight="5dip"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/current_path_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="start"
+                        android:paddingLeft="10dip"
+                        android:singleLine="true"
+                        style="?android:attr/textAppearanceMedium"/>
+                </LinearLayout>
+                <ImageView android:id="@+id/path_pane_arrow"
+                    android:src="@drawable/arrow_down"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical" />
+            </LinearLayout>
+        </LinearLayout>
+        <ImageView android:id="@+id/path_pane_up_level"
+            android:src="@drawable/path_up_level" android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:layout_gravity="center_vertical|right"
+            android:layout_marginLeft="5dip" />
+    </LinearLayout>
+    <!-- end path -->
+
+    <FrameLayout android:layout_width="fill_parent"
+        android:layout_height="0dip" android:layout_weight="1">
+        <ListView android:id="@+id/file_path_list"
+            android:visibility="gone"
+            android:headerDividersEnabled="true"
+            android:footerDividersEnabled="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <ListView android:id="@+id/favorite_list"
+            android:visibility="gone"
+            android:headerDividersEnabled="true"
+            android:footerDividersEnabled="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <LinearLayout android:id="@+id/empty_view"
+            android:orientation="vertical" android:layout_width="fill_parent"
+            android:layout_height="fill_parent" android:gravity="center"
+            android:visibility="gone">
+            <ImageView android:src="@drawable/empty_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            <TextView android:layout_width="wrap_content"
+                android:text="@string/no_file" android:layout_height="wrap_content"
+                android:textColor="#e2e2e2" android:textSize="27px"
+                android:singleLine="true" />
+        </LinearLayout>
+
+        <ScrollView android:id="@+id/dropdown_navigation"
+            android:overScrollMode="never" android:layout_width="fill_parent"
+            android:layout_height="wrap_content" android:background="@drawable/dropdown"
+            android:visibility="gone">
+            <LinearLayout android:id="@+id/dropdown_navigation_list"
+                android:orientation="vertical" android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+            </LinearLayout>
+        </ScrollView>
+
+        <LinearLayout android:id="@+id/sd_not_available_page"
+            android:orientation="vertical" android:layout_width="fill_parent"
+            android:layout_height="fill_parent" android:gravity="center"
+            android:visibility="gone">
+            <ImageView android:src="@drawable/sd_not_available"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="25px" />
+
+            <TextView android:text="@string/enable_sd_card"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" android:textSize="22px"
+                android:gravity="center" />
+
+        </LinearLayout>
+        <LinearLayout android:id="@+id/category_page"
+            android:layout_width="fill_parent" android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+            <LinearLayout android:id="@+id/category_buttons"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip" android:layout_weight="1"
+                android:orientation="vertical">
+                <LinearLayout android:layout_width="fill_parent"
+                    android:layout_height="0dip" android:layout_weight="1"
+                    android:orientation="horizontal"
+                    android:layout_gravity="center">
+                    <LinearLayout android:id="@+id/category_music"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_left">
+                        <ImageView android:src="@drawable/category_icon_music"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_music"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_music_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout android:id="@+id/category_video"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_middle">
+                        <ImageView android:src="@drawable/category_icon_video"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_video"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_video_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout android:id="@+id/category_picture"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_right">
+                        <ImageView android:src="@drawable/category_icon_picture"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_picture"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_picture_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                </LinearLayout>
+                <LinearLayout android:layout_width="fill_parent"
+                    android:layout_height="0dip" android:layout_weight="1"
+                    android:orientation="horizontal"
+                    android:layout_gravity="center">
+                    <LinearLayout android:id="@+id/category_theme"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_left">
+                        <ImageView android:src="@drawable/category_icon_theme"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_theme"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_theme_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout android:id="@+id/category_document"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_middle">
+                        <ImageView android:src="@drawable/category_icon_document"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_document"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_document_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout android:id="@+id/category_zip"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_right">
+                        <ImageView android:src="@drawable/category_icon_zip"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_zip"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_zip_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                </LinearLayout>
+                <LinearLayout android:layout_width="fill_parent"
+                    android:layout_height="0dip" android:layout_weight="1"
+                    android:orientation="horizontal"
+                    android:layout_gravity="center">
+                    <LinearLayout android:id="@+id/category_apk"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_left">
+                        <ImageView android:src="@drawable/category_icon_apk"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_apk"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_apk_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout android:id="@+id/category_favorite"
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_middle">
+                        <ImageView android:src="@drawable/category_icon_favorite"
+                            style="@style/CategoryButtonIconStyle" />
+                        <TextView android:text="@string/category_favorite"
+                            style="@style/CategoryButtonTextStyle" />
+                        <TextView android:id="@+id/category_favorite_count"
+                            style="@style/CategoryButtonCountTextStyle" />
+                    </LinearLayout>
+                    <LinearLayout
+                        style="@style/CategoryButtonStyle"
+                        android:background="@drawable/category_button_right">
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- category information -->
+            <LinearLayout android:layout_width="fill_parent"
+                android:orientation="vertical" android:layout_height="wrap_content"
+                android:layout_gravity="bottom" android:background="@drawable/information_bg"
+                android:gravity="center_vertical" android:paddingTop="5dip">
+                <LinearLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="5dip"
+                    android:layout_marginLeft="20px">
+
+                    <TextView android:id="@+id/sd_card_capacity"
+                        style="@style/InformationTextStyle"
+                        android:drawableLeft="@drawable/sd_card_icon" />
+
+                    <TextView android:id="@+id/sd_card_available"
+                        style="@style/InformationTextStyle"
+                        android:layout_marginLeft="10dip"
+                        android:drawableLeft="@drawable/sd_card_available_icon" />
+                </LinearLayout>
+
+                <net.micode.fileexplorer.CategoryBar
+                    android:id="@+id/category_bar" android:layout_width="fill_parent"
+                    android:layout_height="35px" android:layout_gravity="center"
+                    android:layout_marginBottom="5dip">
+                </net.micode.fileexplorer.CategoryBar>
+
+                <LinearLayout android:layout_width="fill_parent"
+                    android:orientation="vertical"
+                    android:layout_height="wrap_content">
+                    <LinearLayout android:layout_width="fill_parent"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20px"
+                        android:layout_marginBottom="5dip">
+                        <TextView android:id="@+id/category_legend_music"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_music" />
+                        <TextView android:id="@+id/category_legend_video"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_video" />
+                        <TextView android:id="@+id/category_legend_picture"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_picture" />
+                    </LinearLayout>
+                    <LinearLayout android:layout_width="fill_parent"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20px"
+                        android:layout_marginBottom="5dip">
+                        <TextView android:id="@+id/category_legend_theme"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_theme" />
+                        <TextView android:id="@+id/category_legend_document"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_document" />
+                        <TextView android:id="@+id/category_legend_zip"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_zip" />
+                    </LinearLayout>
+                    <LinearLayout android:layout_width="fill_parent"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20px"
+                        android:layout_marginBottom="5dip">
+                        <TextView android:id="@+id/category_legend_apk"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_apk" />
+                        <TextView android:id="@+id/category_legend_other"
+                            style="@style/CategoryLegendStyle"
+                            android:drawableLeft="@drawable/legend_other" />
+                        <TextView
+                            style="@style/CategoryLegendStyle" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+    <LinearLayout android:id="@+id/moving_operation_bar"
+        android:visibility="gone"
+        style="@style/BottomButtonBar">
+
+        <Button android:id="@+id/button_moving_confirm"
+            android:text="@string/confirm"
+            style="@style/BottomButton.Left"/>
+
+        <Button android:id="@+id/button_moving_cancel"
+            android:text="@string/operation_cancel"
+            style="@style/BottomButton.Right"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/file_explorer_list.xml b/res/layout/file_explorer_list.xml
old mode 100644
new mode 100755
index c715da6..005b80b
--- a/res/layout/file_explorer_list.xml
+++ b/res/layout/file_explorer_list.xml
@@ -71,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:headerDividersEnabled="true"
-            android:footerDividersEnabled="true" />
+            android:footerDividersEnabled="true" android:fastScrollEnabled="true"/>
         <LinearLayout
             android:id="@+id/empty_view"
             android:orientation="vertical"
diff --git a/res/layout/fragment_pager.xml b/res/layout/fragment_pager.xml
old mode 100644
new mode 100755
diff --git a/res/layout/information_dialog.xml b/res/layout/information_dialog.xml
old mode 100644
new mode 100755
index 4f0eab6..b2b8a1b
--- a/res/layout/information_dialog.xml
+++ b/res/layout/information_dialog.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300sp"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <TableLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:shrinkColumns="2">
         <TableRow>
             <TextView
                 android:layout_column="1"
@@ -13,17 +14,10 @@
                 android:padding="3dip"
                 android:gravity="right"
                 style="?android:attr/textAppearanceMedium" />
-            <HorizontalScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:padding="3dip">
-                <TextView
-                    android:id="@+id/information_location"
-                    style="?android:attr/textAppearanceSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </HorizontalScrollView>
+            <TextView
+                android:id="@+id/information_location"
+                android:padding="3dip"
+                style="?android:attr/textAppearanceSmall" />
         </TableRow>
         <TableRow>
             <TextView
diff --git a/res/layout/server_control_activity.xml b/res/layout/server_control_activity.xml
old mode 100644
new mode 100755
index 64482f6..08bba2e
--- a/res/layout/server_control_activity.xml
+++ b/res/layout/server_control_activity.xml
@@ -5,35 +5,39 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/wifi_state"
-        android:layout_gravity="center_horizontal"
-        android:singleLine="true"
-        android:layout_marginTop="70px"
-        style="?android:attr/textAppearanceMedium" />
-    <TextView
-        android:id="@+id/wifi_state"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/wifi_state"
-        android:layout_gravity="center_horizontal"
-        android:singleLine="true"
-        android:layout_marginTop="14px"
-        style="?android:attr/textAppearanceSmall" />
-    <ImageView
-        android:id="@+id/wifi_state_image"
-        android:src="@drawable/wifi_state4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="25px" />
-
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/wifi_state"
+            android:layout_gravity="center_horizontal"
+            android:singleLine="true"
+            style="?android:attr/textAppearanceMedium" />
+        <TextView
+            android:id="@+id/wifi_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/wifi_state"
+            android:layout_gravity="center_horizontal"
+            android:singleLine="true"
+            android:padding="5px"
+            style="?android:attr/textAppearanceSmall"/>
+        <ImageView
+            android:id="@+id/wifi_state_image"
+            android:src="@drawable/wifi_state4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
         android:orientation="vertical"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:gravity="bottom">
         <TextView
             android:id="@+id/instruction_pre"
@@ -42,7 +46,6 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/instruction_pre"
             android:visibility="gone"
-            android:layout_marginBottom="73px"
             style="?android:attr/textAppearanceSmall" />
         <TextView
             android:id="@+id/instruction"
@@ -74,8 +77,8 @@
             android:layout_width="274px"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
-            android:layout_marginTop="30px"
-            android:layout_marginBottom="50px"
+            android:layout_marginTop="20px"
+            android:layout_marginBottom="20px"
             android:background="@drawable/btn_bottom_last">
             <TextView
                 android:id="@+id/start_stop_button_text"
diff --git a/res/layout/textinput_dialog.xml b/res/layout/textinput_dialog.xml
old mode 100644
new mode 100755
diff --git a/res/menu/operation_menu.xml b/res/menu/operation_menu.xml
old mode 100644
new mode 100755
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 0000000..5f72f27
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="added_favorite">Zu Favoriten hinzugefügt</string>
+    <string name="app_name">Dateien</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="category_all">Alle</string>
+    <string name="category_apk">APKs</string>
+    <string name="category_document">Dokumente</string>
+    <string name="category_favorite">Favoriten</string>
+    <string name="category_music">Musik</string>
+    <string name="category_other">Sonstige</string>
+    <string name="category_picture">Bilder</string>
+    <string name="category_theme">Themen</string>
+    <string name="category_video">Videos</string>
+    <string name="category_zip">Zips</string>
+    <string name="confirm">OK</string>
+    <string name="confirm_know">OK</string>
+    <string name="enable_sd_card">SD-Karte ist nicht verfügbar, bitte einlegen</string>
+    <string name="error_info_cant_send_folder">Ordner konnte nicht gesendet werden</string>
+    <string name="fail_to_create_folder">Ordner konnte nicht angelegt werden, er existiert bereits</string>
+    <string name="fail_to_rename">Ordner oder Datei konnte nicht umbenannt werden, weil etwas gleichnamiges bereits existiert</string>
+    <string name="file_info_canread">Leserechte:</string>
+    <string name="file_info_canwrite">Schreibrechte:</string>
+    <string name="file_info_ishidden">Versteckt:</string>
+    <string name="file_info_location">Pfad:</string>
+    <string name="file_info_modified">Geändert:</string>
+    <string name="file_info_size">Größe:</string>
+    <string name="file_size">%d Bytes</string>
+    <string name="install_failed">Installation fehlgeschlagen</string>
+    <string name="install_successful">Installation erfolgreich</string>
+    <string name="instruction">Folgende Adresse im FTP-Client eingeben:</string>
+    <string name="instruction_pre">Dienst zum Aktivieren des FTP-Servers starten</string>
+    <string name="menu_item_search">Suchen</string>
+    <string name="menu_item_sort">Sortieren nach</string>
+    <string name="menu_item_sort_date">Datum</string>
+    <string name="menu_item_sort_name">Name</string>
+    <string name="menu_item_sort_size">Größe</string>
+    <string name="menu_item_sort_type">Datentyp</string>
+    <string name="new_folder_name">Neuer Ordner</string>
+    <string name="no">Nein</string>
+    <string name="no_file">Keine Dateien</string>
+    <string name="no_wifi">Kein WLAN</string>
+    <string name="no_wifi_hint">Kein WLAN, WLAN-Einstellungen überprüfen</string>
+    <string name="notif_server_starting">FTP-Server gestartet</string>
+    <string name="notif_title">FTP-Server</string>
+    <string name="operation_cancel">Abbrechen</string>
+    <string name="operation_cancel_selectall">Auswahl aufheben</string>
+    <string name="operation_copy">Kopieren</string>
+    <string name="operation_copy_path">Dateipfad kopieren</string>
+    <string name="operation_create_folder">Neuer Ordner</string>
+    <string name="operation_create_folder_message">Ordername eingeben</string>
+    <string name="operation_delete">Löschen</string>
+    <string name="operation_delete_confirm_message">Löschen bestätigen?</string>
+    <string name="operation_deleting">Wird gelöscht...</string>
+    <string name="operation_favorite">Zu Favoriten hinzufügen</string>
+    <string name="operation_hide_sys">Versteckte Dateien ausblenden</string>
+    <string name="operation_info">Details</string>
+    <string name="operation_move">Verschieben</string>
+    <string name="operation_moving">Wird verschoben...</string>
+    <string name="operation_paste">Einfügen</string>
+    <string name="operation_pasting">Wird eingefügt...</string>
+    <string name="operation_refresh">Aktualisieren</string>
+    <string name="operation_rename">Umbenennen</string>
+    <string name="operation_rename_message">Einen neuen Namen eingeben</string>
+    <string name="operation_selectall">Alle auswählen</string>
+    <string name="operation_send">Senden</string>
+    <string name="operation_show_sys">Versteckte Dateien anzeigen</string>
+    <string name="operation_unfavorite">Aus Favoriten entfernen</string>
+    <string name="removed_favorite">Aus Favoriten entfernt</string>
+    <string name="sd_card_available">Freier Speicher:<xliff:g id="available_size">%1$s</xliff:g></string>
+    <string name="sd_card_size">SD-Karte:<xliff:g id="total_size">%1$s</xliff:g></string>
+    <string name="sd_folder">SD-Karte</string>
+    <string name="search_hint">Dateien suchen</string>
+    <string name="search_title">Dateien suchen</string>
+    <string name="start_server">Dienst starten</string>
+    <string name="stop_server">Dienst anhalten</string>
+    <string name="storage_warning">Der externe Speicher ist nicht verfügbar oder kann nicht gelesen werden</string>
+    <string name="tab_category">Durchsuchen</string>
+    <string name="tab_remote">FTP</string>
+    <string name="tab_sd">Datei</string>
+    <string name="wifi_state">WLAN-Status</string>
+    <string name="yes">Ja</string>
+    <string name="dialog_select_type">Dateityp auswählen</string>
+    <string name="dialog_type_text">Text</string>
+    <string name="dialog_type_audio">Audio</string>
+    <string name="dialog_type_video">Video</string>
+    <string name="dialog_type_image">Bild</string>
+    <string name="favorite_photo">Foto</string>
+    <string name="favorite_sdcard">SD-Karte</string>
+    <string name="favourite_root">Root</string><string name="favorite_screen_cap">MIUI-Bildschirmfoto</string>
+    <string name="favorite_ringtone">Klingelton</string>
+    <string name="multi_select_title"><xliff:g id="number">%1$s</xliff:g> Elemente ausgewählt</string>
+    <string name="menu_setting">Einstellungen</string>
+    <string name="menu_exit">Verlassen</string>
+    <string name="preference_title">Allgemeine Einstellungen</string>
+    <string name="pref_primary_folder">Persönlicher Ordner</string>
+    <string name="pref_read_root">Root lesen</string>
+    <string name="pref_show_real_path">Echten Pfad anzeigen</string>
+    <string name="default_primary_folder">/mnt/sdcard</string>
+    <string name="pref_primary_folder_summary">Der Ordner wird angezeigt, wenn die App gestartet wird, aktuell ist das <xliff:g id="string">%1$s</xliff:g></string>
+    <string name="pref_show_real_path_summary">Echten Pfad in der Navigationsleiste anzeigen</string>
+
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
new file mode 100644
index 0000000..3e79b12
--- /dev/null
+++ b/res/values-es/strings.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="added_favorite">Agregado a favoritos</string>
+    <string name="app_name">Mis archivos</string>
+    <string name="cancel">Cancelar</string>
+    <string name="category_all">Todos</string>
+    <string name="category_apk">APKs</string>
+    <string name="category_document">Documentos</string>
+    <string name="category_favorite">Favoritos</string>
+    <string name="category_music">Música</string>
+    <string name="category_other">Varios</string>
+    <string name="category_picture">Imágenes</string>
+    <string name="category_theme">Temas</string>
+    <string name="category_video">Videos</string>
+    <string name="category_zip">Zips</string>
+    <string name="confirm">Acceptar</string>
+    <string name="confirm_know">Acceptar</string>
+    <string name="enable_sd_card">Tarjeta SD no disponible, por favor conectar una</string>
+    <string name="error_info_cant_send_folder">Imposible enviar el folder</string>
+    <string name="fail_to_create_folder">Falla al crear el folder. El folder ya existe</string>
+    <string name="fail_to_rename">Fallo al renombrar el folder o el folder ya existe.</string>
+    <string name="file_info_canread">Legible:</string>
+    <string name="file_info_canwrite">Grabable:</string>
+    <string name="file_info_ishidden">Escondido:</string>
+    <string name="file_info_location">Ruta:</string>
+    <string name="file_info_modified">Modificado:</string>
+    <string name="file_info_size">Dimensión:</string>
+    <string name="file_size">%d Bytes</string>
+    <string name="install_failed">Falló la instalación</string>
+    <string name="install_successful">Instalación exitosa</string>
+    <string name="instruction">Escribe la siguiente dirección en tu cliente FTP:</string>
+    <string name="instruction_pre">Inicia el servicio para permitir el servidor FTP</string>
+    <string name="menu_item_search">Búsqueda</string>
+    <string name="menu_item_sort">Ordenar por</string>
+    <string name="menu_item_sort_date">Fecha</string>
+    <string name="menu_item_sort_name">Nombre</string>
+    <string name="menu_item_sort_size">Dimensión</string>
+    <string name="menu_item_sort_type">Tipo</string>
+    <string name="new_folder_name">Nuevo folder</string>
+    <string name="no">No</string>
+    <string name="no_file">No se encuentran archivos</string>
+    <string name="no_wifi">No se encuentra red Wi-Fi</string>
+    <string name="no_wifi_hint">No se encuentra red Wi-Fi, presiona para ir a ajustes Wi-Fi</string>
+    <string name="notif_server_starting">Servidor FTP inició</string>
+    <string name="notif_title">Servidor FTP</string>
+    <string name="operation_cancel">Cancelar</string>
+    <string name="operation_cancel_selectall">Desmarcar todos</string>
+    <string name="operation_copy">Copiar</string>
+    <string name="operation_copy_path">Copiar ruta de archivo</string>
+    <string name="operation_create_folder">Folder nuevo</string>
+    <string name="operation_create_folder_message">Nombrar folder</string>
+    <string name="operation_delete">Eliminar</string>
+    <string name="operation_delete_confirm_message">Confirmar eliminar?</string>
+    <string name="operation_deleting">Eliminando&#8230;</string>
+    <string name="operation_favorite">Agregar a favoritos</string>
+    <string name="operation_hide_sys">Esconder archivos ocultos</string>
+    <string name="operation_info">Detalles</string>
+    <string name="operation_move">Mover</string>
+    <string name="operation_moving">Moviendo&#8230;</string>
+    <string name="operation_paste">Pegar</string>
+    <string name="operation_pasting">Pegando&#8230;</string>
+    <string name="operation_refresh">Actualizar</string>
+    <string name="operation_rename">Cambiar nombre</string>
+    <string name="operation_rename_message">Escribir el nuevo nombre</string>
+    <string name="operation_selectall">Seleccionar todo</string>
+    <string name="operation_send">Enviar</string>
+    <string name="operation_show_sys">Mostrar archivos ocultos</string>
+    <string name="operation_unfavorite">Eliminar de favoritos</string>
+    <string name="removed_favorite">Eliminado de favoritos</string>
+    <string name="sd_card_available">Espacio disponible:<xliff:g id="available_size">%1$s</xliff:g></string>
+    <string name="sd_card_size">Tarjeta SD:<xliff:g id="total_size">%1$s</xliff:g></string>
+    <string name="sd_folder">Tarjeta SD</string>
+    <string name="search_hint">Buscar archivos</string>
+    <string name="search_title">Buscar archivos</string>
+    <string name="start_server">Iniciar servicio</string>
+    <string name="stop_server">Detener servicio</string>
+    <string name="storage_warning">Almacenamiento externo no disponible o no puede leerse</string>
+    <string name="tab_category">Buscar</string>
+    <string name="tab_remote">FTP</string>
+    <string name="tab_sd">File</string>
+    <string name="wifi_state">Status WLAN</string>
+    <string name="yes">Sí</string>
+    <string name="dialog_select_type">Seleccionar archivo</string>
+    <string name="dialog_type_text">Texto</string>
+    <string name="dialog_type_audio">Audio</string>
+    <string name="dialog_type_video">Video</string>
+    <string name="dialog_type_image">Imagen</string>
+    <string name="favorite_photo">Fotografía</string>
+    <string name="favorite_sdcard">Tarjeta SD</string>
+    <string name="favourite_root">Carpeta raíz</string>
+    <string name="favorite_screen_cap">Captura de pantalla MIUI</string>
+    <string name="favorite_ringtone">Tono de llamada</string>
+    <string name="multi_select_title">Selección <xliff:g id="number">%1$s</xliff:g> item(s)</string>
+    <string name="menu_setting">Preferencias</string>
+    <string name="menu_exit">Salir</string>
+    <string name="preference_title">Ajustes generales</string>
+    <string name="pref_primary_folder">Archivo principal</string>
+    <string name="pref_read_root">Lectura de archivo raíz</string>
+    <string name="pref_show_real_path">Mostrar ruta real</string>
+    <string name="default_primary_folder">/mnt/sdcard</string>
+    <string name="pref_primary_folder_summary">El folder que se muestra cuando la aplicación inicia y su valor es <xliff:g id="string">%1$s</xliff:g></string>
+    <string name="pref_show_real_path_summary">Mostrar ruta real en la barra de navegación</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
new file mode 100644
index 0000000..370ae98
--- /dev/null
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="added_favorite">Добавлено в избранное</string>
+    <string name="app_name">File Explorer</string>
+    <string name="cancel">Отмена</string>
+    <string name="category_all">Все</string>
+    <string name="category_apk">APKs</string>
+    <string name="category_document">Документы</string>
+    <string name="category_favorite">Избранное</string>
+    <string name="category_music">Музыка</string>
+    <string name="category_other">Остальное</string>
+    <string name="category_picture">Картинки</string>
+    <string name="category_theme">Темы</string>
+    <string name="category_video">Видео</string>
+    <string name="category_zip">Zips</string>
+    <string name="confirm">OK</string>
+    <string name="confirm_know">OK</string>
+    <string name="enable_sd_card">SD карта не обнаружена, вставьте карту</string>
+    <string name="error_info_cant_send_folder">Невозможно отправить папку</string>
+    <string name="fail_to_create_folder">Не удалось создать папку, папка уже существует</string>
+    <string name="fail_to_rename">Не удалось переименовать фаил или папку, такой фаил или папка уже существует</string>
+    <string name="file_info_canread">Чтение:</string>
+    <string name="file_info_canwrite">Запись:</string>
+    <string name="file_info_ishidden">Скрытый:</string>
+    <string name="file_info_location">Путь:</string>
+    <string name="file_info_modified">Модифицирован:</string>
+    <string name="file_info_size">размер:</string>
+    <string name="file_size">%d Байт</string>
+    <string name="install_failed">Установка не удалась</string>
+    <string name="install_successful">Установка завершена</string>
+    <string name="instruction">Введите адрес в адресную строку FTP-клиента:</string>
+    <string name="instruction_pre">Включить службу для активации FTP-сервера</string>
+    <string name="menu_item_search">Поиск</string>
+    <string name="menu_item_sort">Сортировать</string>
+    <string name="menu_item_sort_date">Дата</string>
+    <string name="menu_item_sort_name">Имя</string>
+    <string name="menu_item_sort_size">Размер</string>
+    <string name="menu_item_sort_type">Тип</string>
+    <string name="new_folder_name">Новая папка</string>
+    <string name="no">Нет</string>
+    <string name="no_file">Нет файлов</string>
+    <string name="no_wifi">Нет Wi-Fi сети</string>
+    <string name="no_wifi_hint">Нет Wi-Fi сети, проверьте настройки WiFi</string>
+    <string name="notif_server_starting">FTP сервер запущен</string>
+    <string name="notif_title">FTP сервер</string>
+    <string name="operation_cancel">Отмена</string>
+    <string name="operation_cancel_selectall">Отменить выбранное</string>
+    <string name="operation_copy">Копировать</string>
+    <string name="operation_copy_path">Копировать путь файла</string>
+    <string name="operation_create_folder">Новая папка</string>
+    <string name="operation_create_folder_message">Введите название папки</string>
+    <string name="operation_delete">Удалить</string>
+    <string name="operation_delete_confirm_message">Подтверждение удаления?</string>
+    <string name="operation_deleting">Удаляем</string>
+    <string name="operation_favorite">Добавить в избранное</string>
+    <string name="operation_hide_sys">Не отображать скрытые файлы</string>
+    <string name="operation_info">Детали</string>
+    <string name="operation_move">Переместить</string>
+    <string name="operation_moving">Перемещяем</string>
+    <string name="operation_paste">Вставить</string>
+    <string name="operation_pasting">Вставляем</string>
+    <string name="operation_refresh">Обновить</string>
+    <string name="operation_rename">Переименовать</string>
+    <string name="operation_rename_message">Введите новое имя</string>
+    <string name="operation_selectall">Выбрать все</string>
+    <string name="operation_send">Отправить</string>
+    <string name="operation_show_sys">Показывать скрытые файлы</string>
+    <string name="operation_unfavorite">Удалить из избранного</string>
+    <string name="removed_favorite">Удален из избранного</string>
+    <string name="sd_card_available">Места доступно:<xliff:g id="available_size">%1$s</xliff:g></string>
+    <string name="sd_card_size">SD карта:<xliff:g id="total_size">%1$s</xliff:g></string>
+    <string name="sd_folder">SD карта</string>
+    <string name="search_hint">Поиск файлов</string>
+    <string name="search_title">Поиск файлов</string>
+    <string name="start_server">Запустить службу</string>
+    <string name="stop_server">Остановить службу</string>
+    <string name="storage_warning">Внешние накопители отсутствуют или не могут быть прочитаны</string>
+    <string name="tab_category">Обзор</string>
+    <string name="tab_remote">FTP</string>
+    <string name="tab_sd">File</string>
+    <string name="wifi_state">WLAN статус</string>
+    <string name="yes">Да</string>
+    <string name="dialog_select_type">Выделить файлы по типу</string>
+    <string name="dialog_type_text">Текст</string>
+    <string name="dialog_type_audio">Аудио</string>
+    <string name="dialog_type_video">Видео</string>
+    <string name="dialog_type_image">Картинки</string>
+    <string name="favorite_photo">Фото</string>
+    <string name="favorite_sdcard">SD карта</string>
+    <string name="favourite_root">Root</string><string name="favorite_screen_cap">MIUI Screen Shot</string>
+    <string name="favorite_ringtone">Рингтоны</string>
+    <string name="multi_select_title">Выбраны <xliff:g id="number">%1$s</xliff:g> item(s)</string>
+    <string name="menu_setting">Настройки</string>
+    <string name="menu_exit">Выход</string>
+    <string name="preference_title">Основные настройки</string>
+    <string name="pref_primary_folder">Домашняя папка</string>
+    <string name="pref_read_root">Чтение root</string>
+    <string name="pref_show_real_path">Отобразить реальный путь</string>
+    <string name="default_primary_folder">/mnt/sdcard</string>
+    <string name="pref_primary_folder_summary">Папка, которая появляется при запуске приложения <xliff:g id="string">%1$s</xliff:g></string>
+    <string name="pref_show_real_path_summary">Показать реальный путь в панели навигации</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
old mode 100644
new mode 100755
index 7a10de6..7783e56
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
     <string name="app_name">文件管理</string>
     <string name="confirm">确定</string>
     <string name="menu_item_search">搜索</string>
@@ -28,7 +28,8 @@
     <string name="operation_hide_sys">隐藏点文件和隐藏文件</string>
     <string name="cancel">取消</string>
     <string name="no_file">没有文件</string>
-    <string name="tab_sd">SD卡</string>
+    <string name="tab_category">分类浏览</string>
+    <string name="tab_sd">文件管理</string>
     <string name="tab_remote">远程管理</string>
     <string name="sd_folder">SD卡</string>
     <string name="category_all">所有</string>
@@ -45,6 +46,8 @@
     <string name="operation_create_folder_message">请输入文件夹名称</string>
     <string name="operation_delete_confirm_message">确认删除?</string>
     <string name="new_folder_name">新建文件夹</string>
+    <string name="sd_card_size">SD卡:<xliff:g id="total_size">%1$s</xliff:g></string>
+    <string name="sd_card_available">可用:<xliff:g id="available_size">%1$s</xliff:g></string>
     <string name="file_info_location">位置:</string>
     <string name="file_info_size">大小:</string>
     <string name="file_info_modified">时间:</string>
@@ -74,6 +77,7 @@
     <string name="instruction_pre">启动后可以从电脑端远程管理手机文件</string>
     <string name="instruction">请在“我的电脑”地址栏中输入：</string>
     <string name="no_wifi">无WiFi网络</string>
+    <string name="no_wifi_hint">无WiFi网络,点击以查看WiFi设置</string>
     <string name="search_title">搜索文件</string>
     <string name="search_hint">输入部分或全部文件名</string>
     <string name="file_size">%d 字节</string>
@@ -84,7 +88,17 @@
     <string name="dialog_type_image">图像</string>
     <string name="favorite_photo">照片</string>
     <string name="favorite_sdcard">SD卡</string>
+    <string name="favorite_root">根目录</string>
     <string name="favorite_screen_cap">MIUI截屏</string>
     <string name="favorite_ringtone">铃声</string>
-    <string name="multi_select_title" >已选择 <xliff:g id="number">%1$s</xliff:g> 个</string>
+    <string name="multi_select_title">已选择 <xliff:g id="number">%1$s</xliff:g> 个</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_exit">退出</string>
+    <string name="preference_title">常规设置</string>
+    <string name="pref_primary_folder">主页文件夹</string>
+    <string name="pref_read_root">读取根目录</string>
+    <string name="pref_show_real_path">显示真实路径</string>
+    <string name="pref_primary_folder_summary">程序启动时显示的文件夹，当前路径为<xliff:g id="string">%1$s</xliff:g></string>
+    <string name="pref_show_real_path_summary">在导航栏中显示真实路径</string>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/color.xml b/res/values/color.xml
old mode 100644
new mode 100755
diff --git a/res/values/strings.xml b/res/values/strings.xml
old mode 100644
new mode 100755
index 96f0cf9..a67efce
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
     <string name="added_favorite">Added to Favorites</string>
     <string name="app_name">File Explorer</string>
     <string name="cancel">Cancel</string>
@@ -41,6 +41,7 @@
     <string name="no">No</string>
     <string name="no_file">No files</string>
     <string name="no_wifi">No Wi-Fi network</string>
+    <string name="no_wifi_hint">No Wi-Fi network, press to check WiFi settings</string>
     <string name="notif_server_starting">FTP Server started</string>
     <string name="notif_title">FTP Server</string>
     <string name="operation_cancel">Cancel</string>
@@ -67,14 +68,17 @@
     <string name="operation_show_sys">Show hidden files</string>
     <string name="operation_unfavorite">Remove from Favorites</string>
     <string name="removed_favorite">Removed from Favorites</string>
+    <string name="sd_card_available">Space available:<xliff:g id="available_size">%1$s</xliff:g></string>
+    <string name="sd_card_size">SD card:<xliff:g id="total_size">%1$s</xliff:g></string>
     <string name="sd_folder">SD card</string>
     <string name="search_hint">Search Files</string>
     <string name="search_title">Search Files</string>
     <string name="start_server">Start Service</string>
     <string name="stop_server">Stop Service</string>
     <string name="storage_warning">External storage is not available or cannot be read</string>
+    <string name="tab_category">Browse</string>
     <string name="tab_remote">FTP</string>
-    <string name="tab_sd">SD card</string>
+    <string name="tab_sd">File</string>
     <string name="wifi_state">WLAN Status</string>
     <string name="yes">Yes</string>
     <string name="dialog_select_type">Select file type</string>
@@ -84,7 +88,17 @@
     <string name="dialog_type_image">Image</string>
     <string name="favorite_photo">Photo</string>
     <string name="favorite_sdcard">SD Card</string>
-    <string name="favorite_screen_cap">MIUI Screen Shot</string>
+    <string name="favourite_root">Root</string><string name="favorite_screen_cap">MIUI Screen Shot</string>
     <string name="favorite_ringtone">Ringtone</string>
-    <string name="multi_select_title" >Selected <xliff:g id="number">%1$s</xliff:g> item(s)</string>
+    <string name="multi_select_title">Selected <xliff:g id="number">%1$s</xliff:g> item(s)</string>
+    <string name="menu_setting">Preferences</string>
+    <string name="menu_exit">Exit</string>
+    <string name="preference_title">General Settings</string>
+    <string name="pref_primary_folder">Home folder</string>
+    <string name="pref_read_root">Read root</string>
+    <string name="pref_show_real_path">Display real path</string>
+    <string name="default_primary_folder">/mnt/sdcard</string>
+    <string name="pref_primary_folder_summary">The folder that appears when the app starts, and current value is <xliff:g id="string">%1$s</xliff:g></string>
+    <string name="pref_show_real_path_summary">Show real path in navigation bar</string>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
old mode 100644
new mode 100755
index d69da2c..c559229
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -118,6 +118,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:textColor">#222222</item>
         <item name="android:textSize">12dip</item>
+        <item name="android:drawablePadding">5dip</item>
     </style>
     <style name="CategoryLegendStyle">
         <item name="android:layout_height">wrap_content</item>
@@ -129,6 +130,16 @@
         <item name="android:textSize">10dip</item>
         <item name="android:layout_marginLeft">2dip</item>
     </style>
+    <style name="CategoryLegendStyleLand">
+        <item name="android:layout_height">0dip</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:gravity">left</item>
+        <item name="android:drawablePadding">5px</item>
+        <item name="android:textColor">#222222</item>
+        <item name="android:textSize">10dip</item>
+        <item name="android:layout_marginLeft">2dip</item>
+    </style>
     <style name="InformationDialog" parent="android:style/Theme.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@drawable/popup_bg</item>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
new file mode 100644
index 0000000..5366c97
--- /dev/null
+++ b/res/xml/preferences.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceCategory android:title="@string/preference_title" >
+        <EditTextPreference
+            android:defaultValue="@string/default_primary_folder"
+            android:key="pref_key_primary_folder"
+            android:summary="@string/pref_primary_folder_summary"
+            android:title="@string/pref_primary_folder" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_key_read_root"
+            android:title="@string/pref_read_root" />
+        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_key_show_real_path"
+            android:title="@string/pref_show_real_path" 
+            android:summary="@string/pref_show_real_path_summary"/>
+        
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
old mode 100644
new mode 100755
diff --git a/src/net/micode/fileexplorer/CategoryBar.java b/src/net/micode/fileexplorer/CategoryBar.java
index 0b4b814..fa68120 100644
--- a/src/net/micode/fileexplorer/CategoryBar.java
+++ b/src/net/micode/fileexplorer/CategoryBar.java
@@ -87,30 +87,59 @@ public boolean setCategoryValue(int index, long value) {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        int width = getWidth() - MARGIN * 2;
         Drawable d = getDrawable(R.drawable.category_bar_empty);
 
-        int left = MARGIN;
-        Rect bounds = new Rect(left, 0, left + width, d.getIntrinsicHeight());
+        int width = getWidth() - MARGIN * 2;
+        int height = getHeight() - MARGIN * 2;
+        boolean isHorizontal = (width > height);
+
+        Rect bounds = null;
+        if ( isHorizontal )
+            bounds = new Rect(MARGIN, 0, MARGIN + width, d.getIntrinsicHeight());
+        else
+            bounds = new Rect(0, MARGIN, d.getIntrinsicWidth(), MARGIN + height);
+
+        int beginning = MARGIN;
+        if ( !isHorizontal ) beginning += height;
         d.setBounds(bounds);
         d.draw(canvas);
         if (mFullValue != 0) {
             for (Category c : categories) {
                 long value = (timer == null ? c.value : c.tmpValue);
-                int w = (int) (value * width / mFullValue);
-                if (w == 0)
-                    continue;
-                bounds.left = left;
-                bounds.right = left + w;
-                d = getDrawable(c.resImg);
-                bounds.bottom = bounds.top + d.getIntrinsicHeight();
-                d.setBounds(bounds);
-                d.draw(canvas);
-                left += w;
+                if ( isHorizontal ) {
+                    int w = (int) (value * width / mFullValue);
+                    if (w == 0)
+                        continue;
+                    bounds.left = beginning;
+                    bounds.right = beginning + w;
+                    d = getDrawable(c.resImg);
+                    bounds.bottom = bounds.top + d.getIntrinsicHeight();
+                    d.setBounds(bounds);
+                    d.draw(canvas);
+                    beginning += w;
+                }
+                else {
+                    int h = (int) (value * height / mFullValue);
+                    if (h == 0)
+                        continue;
+                    bounds.bottom = beginning;
+                    bounds.top = beginning - h;
+                    d = getDrawable(c.resImg);
+                    bounds.right = bounds.left + d.getIntrinsicWidth();
+                    d.setBounds(bounds);
+                    d.draw(canvas);
+                    beginning -= h;
+                }
             }
         }
-        bounds.left = 0;
-        bounds.right = bounds.left + getWidth();
+        if ( isHorizontal ) {
+            bounds.left = 0;
+            bounds.right = bounds.left + getWidth();
+        }
+        else {
+            bounds.top = 0;
+            bounds.bottom = bounds.top + getHeight();
+        }
         d = getDrawable(R.drawable.category_bar_mask);
         d.setBounds(bounds);
         d.draw(canvas);
diff --git a/src/net/micode/fileexplorer/FavoriteList.java b/src/net/micode/fileexplorer/FavoriteList.java
new file mode 100755
index 0000000..b774ad7
--- /dev/null
+++ b/src/net/micode/fileexplorer/FavoriteList.java
@@ -0,0 +1,184 @@
+
+package net.micode.fileexplorer;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.database.Cursor;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.View;
+import android.view.View.OnCreateContextMenuListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import net.micode.fileexplorer.FavoriteDatabaseHelper.FavoriteDatabaseListener;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class FavoriteList implements FavoriteDatabaseListener {
+    private static final String LOG_TAG = "FavoriteList";
+
+    private ArrayList<FavoriteItem> mFavoriteList = new ArrayList<FavoriteItem>();
+
+    private ArrayAdapter<FavoriteItem> mFavoriteListAdapter;
+
+    private FavoriteDatabaseHelper mFavoriteDatabase;
+
+    private ListView mListView;
+
+    private FavoriteDatabaseListener mListener;
+
+    private Context mContext;
+
+    public FavoriteList(Context context, ListView list, FavoriteDatabaseListener listener,
+            FileIconHelper iconHelper) {
+        mContext = context;
+
+        mFavoriteDatabase = new FavoriteDatabaseHelper(context, this);
+        mFavoriteListAdapter = new FavoriteListAdapter(context, R.layout.favorite_item,
+                mFavoriteList, iconHelper);
+        setupFavoriteListView(list);
+        mListener = listener;
+    }
+
+    public ArrayAdapter<FavoriteItem> getArrayAdapter() {
+        return mFavoriteListAdapter;
+    }
+
+    public void update() {
+        mFavoriteList.clear();
+
+        Cursor c = mFavoriteDatabase.query();
+        if (c != null) {
+            while (c.moveToNext()) {
+                FavoriteItem item = new FavoriteItem(c.getLong(0), c.getString(1), c.getString(2));
+                item.fileInfo = Util.GetFileInfo(item.location);
+                mFavoriteList.add(item);
+            }
+            c.close();
+        }
+
+        // remove not existing items
+        if (Util.isSDCardReady()) {
+            for (int i = mFavoriteList.size() - 1; i >= 0; i--) {
+                File file = new File(mFavoriteList.get(i).location);
+                if (file.exists())
+                    continue;
+
+                FavoriteItem favorite = mFavoriteList.get(i);
+                mFavoriteDatabase.delete(favorite.id, false);
+                mFavoriteList.remove(i);
+            }
+        }
+
+        mFavoriteListAdapter.notifyDataSetChanged();
+    }
+
+    public void initList() {
+        mFavoriteList.clear();
+        Cursor c = mFavoriteDatabase.query();
+        if (c != null)
+            c.close();
+
+        if (mFavoriteDatabase.isFirstCreate()) {
+            for (FavoriteItem fi : Util.getDefaultFavorites(mContext)) {
+                mFavoriteDatabase.insert(fi.title, fi.location);
+            }
+        }
+
+        update();
+    }
+
+    public long getCount() {
+        return mFavoriteList.size();
+    }
+
+    public void show(boolean show) {
+        mListView.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
+    private void setupFavoriteListView(ListView list) {
+        mListView = list;
+        mListView.setAdapter(mFavoriteListAdapter);
+        mListView.setLongClickable(true);
+        mListView.setOnCreateContextMenuListener(mListViewContextMenuListener);
+        mListView.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                onFavoriteListItemClick(parent, view, position, id);
+            }
+        });
+    }
+
+    public void onFavoriteListItemClick(AdapterView<?> parent, View view, int position, long id) {
+        FavoriteItem favorite = mFavoriteList.get(position);
+
+        if (favorite.fileInfo.IsDir) {
+            FileExplorerTabActivity activity = (FileExplorerTabActivity) mContext;
+            ((FileViewActivity) activity.getFragment(Util.SDCARD_TAB_INDEX))
+                    .setPath(favorite.location);
+            activity.getActionBar().setSelectedNavigationItem(Util.SDCARD_TAB_INDEX);
+        } else {
+            try {
+                IntentBuilder.viewFile(mContext, favorite.fileInfo.filePath);
+            } catch (ActivityNotFoundException e) {
+                Log.e(LOG_TAG, "fail to view file: " + e.toString());
+            }
+        }
+    }
+
+    private static final int MENU_UNFAVORITE = 100;
+
+    // context menu
+    private OnCreateContextMenuListener mListViewContextMenuListener = new OnCreateContextMenuListener() {
+        @Override
+        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+            menu.add(0, MENU_UNFAVORITE, 0, R.string.operation_unfavorite)
+                    .setOnMenuItemClickListener(menuItemClick);
+        }
+    };
+
+    private OnMenuItemClickListener menuItemClick = new OnMenuItemClickListener() {
+
+        @Override
+        public boolean onMenuItemClick(MenuItem item) {
+            int itemId = item.getItemId();
+            AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+            int position = info != null ? info.position : -1;
+
+            switch (itemId) {
+                case MENU_UNFAVORITE:
+                    if (position != -1) {
+                        deleteFavorite(position);
+                    }
+                    break;
+
+                default:
+                    return false;
+            }
+
+            return true;
+        }
+    };
+
+    private void deleteFavorite(int position) {
+        FavoriteItem favorite = mFavoriteList.get(position);
+        mFavoriteDatabase.delete(favorite.id, false);
+        mFavoriteList.remove(position);
+        mFavoriteListAdapter.notifyDataSetChanged();
+        mListener.onFavoriteDatabaseChanged();
+    }
+
+    @Override
+    public void onFavoriteDatabaseChanged() {
+        update();
+        mListener.onFavoriteDatabaseChanged();
+    }
+}
diff --git a/src/net/micode/fileexplorer/FavoriteListAdapter.java b/src/net/micode/fileexplorer/FavoriteListAdapter.java
index fb54716..a7da981 100644
--- a/src/net/micode/fileexplorer/FavoriteListAdapter.java
+++ b/src/net/micode/fileexplorer/FavoriteListAdapter.java
@@ -55,8 +55,19 @@ public View getView(int position, View convertView, ViewGroup parent) {
         FileInfo lFileInfo = item.fileInfo;
 
         Util.setText(view, R.id.file_name, item.title != null ? item.title : lFileInfo.fileName);
-        Util.setText(view, R.id.modified_time, Util.formatDateString(mContext, lFileInfo.ModifiedDate));
-        Util.setText(view, R.id.file_size, (lFileInfo.IsDir ? "" : Util.convertStorage(lFileInfo.fileSize)));
+        if (lFileInfo.ModifiedDate > 0) {
+            Util.setText(view, R.id.modified_time, Util.formatDateString(mContext, lFileInfo.ModifiedDate));
+            view.findViewById(R.id.modified_time).setVisibility(View.VISIBLE);
+        } else {
+            view.findViewById(R.id.modified_time).setVisibility(View.GONE);
+        }
+        view.findViewById(R.id.modified_time).setVisibility(lFileInfo.ModifiedDate > 0 ? View.VISIBLE: View.GONE);
+        if (lFileInfo.IsDir) {
+            view.findViewById(R.id.file_size).setVisibility(View.GONE);
+        } else {
+            view.findViewById(R.id.file_size).setVisibility(View.VISIBLE);
+            Util.setText(view, R.id.file_size, Util.convertStorage(lFileInfo.fileSize));
+        }
 
         ImageView lFileImage = (ImageView) view.findViewById(R.id.file_image);
         ImageView lFileImageFrame = (ImageView) view.findViewById(R.id.file_image_frame);
diff --git a/src/net/micode/fileexplorer/FileCategoryActivity.java b/src/net/micode/fileexplorer/FileCategoryActivity.java
new file mode 100755
index 0000000..8ebcb66
--- /dev/null
+++ b/src/net/micode/fileexplorer/FileCategoryActivity.java
@@ -0,0 +1,620 @@
+
+package net.micode.fileexplorer;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import net.micode.fileexplorer.FavoriteDatabaseHelper.FavoriteDatabaseListener;
+import net.micode.fileexplorer.FileCategoryHelper.CategoryInfo;
+import net.micode.fileexplorer.FileCategoryHelper.FileCategory;
+import net.micode.fileexplorer.FileExplorerTabActivity.IBackPressedListener;
+import net.micode.fileexplorer.FileViewInteractionHub.Mode;
+import net.micode.fileexplorer.Util.SDCardInfo;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class FileCategoryActivity extends Fragment implements IFileInteractionListener,
+        FavoriteDatabaseListener, IBackPressedListener {
+
+    public static final String EXT_FILETER_KEY = "ext_filter";
+
+    private static final String LOG_TAG = "FileCategoryActivity";
+
+    private static HashMap<Integer, FileCategory> button2Category = new HashMap<Integer, FileCategory>();
+
+    private HashMap<FileCategory, Integer> categoryIndex = new HashMap<FileCategory, Integer>();
+
+    private FileListCursorAdapter mAdapter;
+
+    private FileViewInteractionHub mFileViewInteractionHub;
+
+    private FileCategoryHelper mFileCagetoryHelper;
+
+    private FileIconHelper mFileIconHelper;
+
+    private CategoryBar mCategoryBar;
+
+    private ScannerReceiver mScannerReceiver;
+
+    private FavoriteList mFavoriteList;
+
+    private ViewPage curViewPage = ViewPage.Invalid;
+
+    private ViewPage preViewPage = ViewPage.Invalid;
+
+    private Activity mActivity;
+
+    private View mRootView;
+
+    private FileViewActivity mFileViewActivity;
+
+    private boolean mConfigurationChanged = false;
+
+    public void setConfigurationChanged(boolean changed) {
+        mConfigurationChanged = changed;
+    }
+
+    static {
+        button2Category.put(R.id.category_music, FileCategory.Music);
+        button2Category.put(R.id.category_video, FileCategory.Video);
+        button2Category.put(R.id.category_picture, FileCategory.Picture);
+        button2Category.put(R.id.category_theme, FileCategory.Theme);
+        button2Category.put(R.id.category_document, FileCategory.Doc);
+        button2Category.put(R.id.category_zip, FileCategory.Zip);
+        button2Category.put(R.id.category_apk, FileCategory.Apk);
+        button2Category.put(R.id.category_favorite, FileCategory.Favorite);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        mActivity = getActivity();
+        mFileViewActivity = (FileViewActivity) ((FileExplorerTabActivity) mActivity)
+                .getFragment(Util.SDCARD_TAB_INDEX);
+        mRootView = inflater.inflate(R.layout.file_explorer_category, container, false);
+        curViewPage = ViewPage.Invalid;
+        mFileViewInteractionHub = new FileViewInteractionHub(this);
+        mFileViewInteractionHub.setMode(Mode.View);
+        mFileViewInteractionHub.setRootPath("/");
+        mFileIconHelper = new FileIconHelper(mActivity);
+        mFavoriteList = new FavoriteList(mActivity, (ListView) mRootView.findViewById(R.id.favorite_list), this, mFileIconHelper);
+        mFavoriteList.initList();
+        mAdapter = new FileListCursorAdapter(mActivity, null, mFileViewInteractionHub, mFileIconHelper);
+
+        ListView fileListView = (ListView) mRootView.findViewById(R.id.file_path_list);
+        fileListView.setAdapter(mAdapter);
+
+        setupClick();
+        setupCategoryInfo();
+        updateUI();
+        registerScannerReceiver();
+
+        return mRootView;
+    }
+
+    private void registerScannerReceiver() {
+        mScannerReceiver = new ScannerReceiver();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
+        intentFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
+        intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
+        intentFilter.addDataScheme("file");
+        mActivity.registerReceiver(mScannerReceiver, intentFilter);
+    }
+
+    private void setupCategoryInfo() {
+        mFileCagetoryHelper = new FileCategoryHelper(mActivity);
+
+        mCategoryBar = (CategoryBar) mRootView.findViewById(R.id.category_bar);
+        int[] imgs = new int[] {
+                R.drawable.category_bar_music, R.drawable.category_bar_video,
+                R.drawable.category_bar_picture, R.drawable.category_bar_theme,
+                R.drawable.category_bar_document, R.drawable.category_bar_zip,
+                R.drawable.category_bar_apk, R.drawable.category_bar_other
+        };
+
+        for (int i = 0; i < imgs.length; i++) {
+            mCategoryBar.addCategory(imgs[i]);
+        }
+
+        for (int i = 0; i < FileCategoryHelper.sCategories.length; i++) {
+            categoryIndex.put(FileCategoryHelper.sCategories[i], i);
+        }
+    }
+
+    public void refreshCategoryInfo() {
+        SDCardInfo sdCardInfo = Util.getSDCardInfo();
+        if (sdCardInfo != null) {
+            mCategoryBar.setFullValue(sdCardInfo.total);
+            setTextView(R.id.sd_card_capacity, getString(R.string.sd_card_size, Util.convertStorage(sdCardInfo.total)));
+            setTextView(R.id.sd_card_available, getString(R.string.sd_card_available, Util.convertStorage(sdCardInfo.free)));
+        }
+
+        mFileCagetoryHelper.refreshCategoryInfo();
+
+        // the other category size should include those files didn't get scanned.
+        long size = 0;
+        for (FileCategory fc : FileCategoryHelper.sCategories) {
+            CategoryInfo categoryInfo = mFileCagetoryHelper.getCategoryInfos().get(fc);
+            setCategoryCount(fc, categoryInfo.count);
+
+            // other category size should be set separately with calibration
+            if(fc == FileCategory.Other)
+                continue;
+
+            setCategorySize(fc, categoryInfo.size);
+            setCategoryBarValue(fc, categoryInfo.size);
+            size += categoryInfo.size;
+        }
+
+        if (sdCardInfo != null) {
+            long otherSize = sdCardInfo.total - sdCardInfo.free - size;
+            setCategorySize(FileCategory.Other, otherSize);
+            setCategoryBarValue(FileCategory.Other, otherSize);
+        }
+
+        setCategoryCount(FileCategory.Favorite, mFavoriteList.getCount());
+
+        if (mCategoryBar.getVisibility() == View.VISIBLE) {
+            mCategoryBar.startAnimation();
+        }
+    }
+
+    public enum ViewPage {
+        Home, Favorite, Category, NoSD, Invalid
+    }
+
+    private void showPage(ViewPage p) {
+        if (curViewPage == p) return;
+
+        curViewPage = p;
+
+        showView(R.id.file_path_list, false);
+        showView(R.id.navigation_bar, false);
+        showView(R.id.category_page, false);
+        showView(R.id.operation_bar, false);
+        showView(R.id.sd_not_available_page, false);
+        mFavoriteList.show(false);
+        showEmptyView(false);
+
+        switch (p) {
+            case Home:
+                showView(R.id.category_page, true);
+                if (mConfigurationChanged) {
+                    ((FileExplorerTabActivity) mActivity).reInstantiateCategoryTab();
+                    mConfigurationChanged = false;
+                }
+                break;
+            case Favorite:
+                showView(R.id.navigation_bar, true);
+                mFavoriteList.show(true);
+                showEmptyView(mFavoriteList.getCount() == 0);
+                break;
+            case Category:
+                showView(R.id.navigation_bar, true);
+                showView(R.id.file_path_list, true);
+                showEmptyView(mAdapter.getCount() == 0);
+                break;
+            case NoSD:
+                showView(R.id.sd_not_available_page, true);
+                break;
+        }
+    }
+
+    private void showEmptyView(boolean show) {
+        View emptyView = mActivity.findViewById(R.id.empty_view);
+        if (emptyView != null)
+            emptyView.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
+    private void showView(int id, boolean show) {
+        View view = mRootView.findViewById(id);
+        if (view != null) {
+            view.setVisibility(show ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    View.OnClickListener onClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            FileCategory f = button2Category.get(v.getId());
+            if (f != null) {
+                onCategorySelected(f);
+                if (f != FileCategory.Favorite) {
+                    setHasOptionsMenu(true);
+                }
+            }
+        }
+
+    };
+
+    private void setCategoryCount(FileCategory fc, long count) {
+        int id = getCategoryCountId(fc);
+        if (id == 0)
+            return;
+
+        setTextView(id, "(" + count + ")");
+    }
+
+    private void setTextView(int id, String t) {
+        TextView text = (TextView) mRootView.findViewById(id);
+        text.setText(t);
+    }
+
+    private void onCategorySelected(FileCategory f) {
+        if (mFileCagetoryHelper.getCurCategory() != f) {
+            mFileCagetoryHelper.setCurCategory(f);
+            mFileViewInteractionHub.setCurrentPath(mFileViewInteractionHub.getRootPath()
+                    + getString(mFileCagetoryHelper.getCurCategoryNameResId()));
+            mFileViewInteractionHub.refreshFileList();
+        }
+
+        if (f == FileCategory.Favorite) {
+            showPage(ViewPage.Favorite);
+        } else {
+            showPage(ViewPage.Category);
+        }
+    }
+
+    private void setupClick(int id) {
+        View button = mRootView.findViewById(id);
+        button.setOnClickListener(onClickListener);
+    }
+
+    private void setupClick() {
+        setupClick(R.id.category_music);
+        setupClick(R.id.category_video);
+        setupClick(R.id.category_picture);
+        setupClick(R.id.category_theme);
+        setupClick(R.id.category_document);
+        setupClick(R.id.category_zip);
+        setupClick(R.id.category_apk);
+        setupClick(R.id.category_favorite);
+    }
+
+    @Override
+    public boolean onBack() {
+        if (isHomePage() || curViewPage == ViewPage.NoSD || mFileViewInteractionHub == null) {
+            return false;
+        }
+
+        return mFileViewInteractionHub.onBackPressed();
+    }
+
+    public boolean isHomePage() {
+        return curViewPage == ViewPage.Home;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (curViewPage != ViewPage.Category && curViewPage != ViewPage.Favorite) {
+            return;
+        }
+        mFileViewInteractionHub.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        if (!isHomePage() && mFileCagetoryHelper.getCurCategory() != FileCategory.Favorite) {
+            mFileViewInteractionHub.onPrepareOptionsMenu(menu);
+        }
+    }
+
+    public boolean onRefreshFileList(String path, FileSortHelper sort) {
+        FileCategory curCategory = mFileCagetoryHelper.getCurCategory();
+        if (curCategory == FileCategory.Favorite || curCategory == FileCategory.All)
+            return false;
+
+        Cursor c = mFileCagetoryHelper.query(curCategory, sort.getSortMethod());
+        showEmptyView(c == null || c.getCount() == 0);
+        mAdapter.changeCursor(c);
+
+        return true;
+    }
+
+    @Override
+    public View getViewById(int id) {
+        return mRootView.findViewById(id);
+    }
+
+    @Override
+    public Context getContext() {
+        return mActivity;
+    }
+
+    @Override
+    public void onDataChanged() {
+        runOnUiThread(new Runnable() {
+
+            @Override
+            public void run() {
+                mAdapter.notifyDataSetChanged();
+                mFavoriteList.getArrayAdapter().notifyDataSetChanged();
+                showEmptyView(mAdapter.getCount() == 0);
+            }
+
+        });
+    }
+
+    @Override
+    public void onPick(FileInfo f) {
+        // do nothing
+    }
+
+    @Override
+    public boolean shouldShowOperationPane() {
+        return true;
+    }
+
+    @Override
+    public boolean onOperation(int id) {
+        mFileViewInteractionHub.addContextMenuSelectedItem();
+        switch (id) {
+            case R.id.button_operation_copy:
+            case GlobalConsts.MENU_COPY:
+                copyFileInFileView(mFileViewInteractionHub.getSelectedFileList());
+                mFileViewInteractionHub.clearSelection();
+                break;
+            case R.id.button_operation_move:
+            case GlobalConsts.MENU_MOVE:
+                startMoveToFileView(mFileViewInteractionHub.getSelectedFileList());
+                mFileViewInteractionHub.clearSelection();
+                break;
+            case GlobalConsts.OPERATION_UP_LEVEL:
+                setHasOptionsMenu(false);
+                showPage(ViewPage.Home);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String getDisplayPath(String path) {
+        return getString(R.string.tab_category) + path;
+    }
+
+    @Override
+    public String getRealPath(String displayPath) {
+        return "";
+    }
+
+    @Override
+    public boolean onNavigation(String path) {
+        showPage(ViewPage.Home);
+        return true;
+    }
+
+    @Override
+    public boolean shouldHideMenu(int menu) {
+        return (menu == GlobalConsts.MENU_NEW_FOLDER || menu == GlobalConsts.MENU_FAVORITE
+                || menu == GlobalConsts.MENU_PASTE || menu == GlobalConsts.MENU_SHOWHIDE);
+    }
+
+    @Override
+    public void addSingleFile(FileInfo file) {
+        refreshList();
+    }
+
+    @Override
+    public Collection<FileInfo> getAllFiles() {
+        return mAdapter.getAllFiles();
+    }
+
+    @Override
+    public FileInfo getItem(int pos) {
+        return mAdapter.getFileItem(pos);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mAdapter.getCount();
+    }
+
+    @Override
+    public void sortCurrentList(FileSortHelper sort) {
+        refreshList();
+    }
+
+    private void refreshList() {
+        mFileViewInteractionHub.refreshFileList();
+    }
+
+    private void copyFileInFileView(ArrayList<FileInfo> files) {
+        if (files.size() == 0) return;
+        mFileViewActivity.copyFile(files);
+        mActivity.getActionBar().setSelectedNavigationItem(Util.SDCARD_TAB_INDEX);
+    }
+
+    private void startMoveToFileView(ArrayList<FileInfo> files) {
+        if (files.size() == 0) return;
+        mFileViewActivity.moveToFile(files);
+        mActivity.getActionBar().setSelectedNavigationItem(Util.SDCARD_TAB_INDEX);
+    }
+
+    @Override
+    public FileIconHelper getFileIconHelper() {
+        return mFileIconHelper;
+    }
+
+    private static int getCategoryCountId(FileCategory fc) {
+        switch (fc) {
+            case Music:
+                return R.id.category_music_count;
+            case Video:
+                return R.id.category_video_count;
+            case Picture:
+                return R.id.category_picture_count;
+            case Theme:
+                return R.id.category_theme_count;
+            case Doc:
+                return R.id.category_document_count;
+            case Zip:
+                return R.id.category_zip_count;
+            case Apk:
+                return R.id.category_apk_count;
+            case Favorite:
+                return R.id.category_favorite_count;
+        }
+
+        return 0;
+    }
+
+    private void setCategorySize(FileCategory fc, long size) {
+        int txtId = 0;
+        int resId = 0;
+        switch (fc) {
+            case Music:
+                txtId = R.id.category_legend_music;
+                resId = R.string.category_music;
+                break;
+            case Video:
+                txtId = R.id.category_legend_video;
+                resId = R.string.category_video;
+                break;
+            case Picture:
+                txtId = R.id.category_legend_picture;
+                resId = R.string.category_picture;
+                break;
+            case Theme:
+                txtId = R.id.category_legend_theme;
+                resId = R.string.category_theme;
+                break;
+            case Doc:
+                txtId = R.id.category_legend_document;
+                resId = R.string.category_document;
+                break;
+            case Zip:
+                txtId = R.id.category_legend_zip;
+                resId = R.string.category_zip;
+                break;
+            case Apk:
+                txtId = R.id.category_legend_apk;
+                resId = R.string.category_apk;
+                break;
+            case Other:
+                txtId = R.id.category_legend_other;
+                resId = R.string.category_other;
+                break;
+        }
+
+        if (txtId == 0 || resId == 0)
+            return;
+
+        setTextView(txtId, getString(resId) + ":" + Util.convertStorage(size));
+    }
+
+    private void setCategoryBarValue(FileCategory f, long size) {
+        if (mCategoryBar == null) {
+            mCategoryBar = (CategoryBar) mRootView.findViewById(R.id.category_bar);
+        }
+        mCategoryBar.setCategoryValue(categoryIndex.get(f), size);
+    }
+
+    public void onDestroy() {
+        super.onDestroy();
+        if (mActivity != null) {
+            mActivity.unregisterReceiver(mScannerReceiver);
+        }
+    }
+
+    private class ScannerReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Log.v(LOG_TAG, "received broadcast: " + action.toString());
+            // handle intents related to external storage
+            if (action.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED) || action.equals(Intent.ACTION_MEDIA_MOUNTED)
+                    || action.equals(Intent.ACTION_MEDIA_UNMOUNTED)) {
+                notifyFileChanged();
+            }
+        }
+    }
+
+    private void updateUI() {
+        boolean sdCardReady = Util.isSDCardReady();
+        if (sdCardReady) {
+            if (preViewPage != ViewPage.Invalid) {
+                showPage(preViewPage);
+                preViewPage = ViewPage.Invalid;
+            } else if (curViewPage == ViewPage.Invalid || curViewPage == ViewPage.NoSD) {
+                showPage(ViewPage.Home);
+            }
+            refreshCategoryInfo();
+            // refresh file list
+            mFileViewInteractionHub.refreshFileList();
+            // refresh file list view in another tab
+            mFileViewActivity.refresh();
+        } else {
+            preViewPage = curViewPage;
+            showPage(ViewPage.NoSD);
+        }
+    }
+
+    // process file changed notification, using a timer to avoid frequent
+    // refreshing due to batch changing on file system
+    synchronized public void notifyFileChanged() {
+        if (timer != null) {
+            timer.cancel();
+        }
+        timer = new Timer();
+        timer.schedule(new TimerTask() {
+
+            public void run() {
+                timer = null;
+                Message message = new Message();
+                message.what = MSG_FILE_CHANGED_TIMER;
+                handler.sendMessage(message);
+            }
+
+        }, 1000);
+    }
+
+    private static final int MSG_FILE_CHANGED_TIMER = 100;
+
+    private Timer timer;
+
+    private Handler handler = new Handler() {
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_FILE_CHANGED_TIMER:
+                    updateUI();
+                    break;
+            }
+            super.handleMessage(msg);
+        }
+
+    };
+
+    // update the count of favorite
+    @Override
+    public void onFavoriteDatabaseChanged() {
+        setCategoryCount(FileCategory.Favorite, mFavoriteList.getCount());
+    }
+
+    @Override
+    public void runOnUiThread(Runnable r) {
+        mActivity.runOnUiThread(r);
+    }
+}
diff --git a/src/net/micode/fileexplorer/FileCategoryHelper.java b/src/net/micode/fileexplorer/FileCategoryHelper.java
index 98c72f8..88d5873 100644
--- a/src/net/micode/fileexplorer/FileCategoryHelper.java
+++ b/src/net/micode/fileexplorer/FileCategoryHelper.java
@@ -20,9 +20,21 @@
 package net.micode.fileexplorer;
 
 import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore.Audio;
+import android.provider.MediaStore.Files;
+import android.provider.MediaStore.Files.FileColumns;
+import android.provider.MediaStore.Images;
+import android.provider.MediaStore.Video;
+import android.util.Log;
+
+import net.micode.fileexplorer.FileSortHelper.SortMethod;
+import net.micode.fileexplorer.MediaFile.MediaFileType;
 
 import java.io.FilenameFilter;
 import java.util.HashMap;
+import java.util.Iterator;
 
 public class FileCategoryHelper {
     public static final int COLUMN_ID = 0;
@@ -41,19 +53,9 @@ public enum FileCategory {
 
     private static String APK_EXT = "apk";
     private static String THEME_EXT = "mtz";
-    private static String[] DOCUMENT_EXTS = new String[] {
-            "doc", "ppt", "docx", "pptx", "xsl", "xslx", "txt", "log", "pdf", "ini", "lrc"
-    };
     private static String[] ZIP_EXTS  = new String[] {
             "zip", "rar"
     };
-    private static String[] VIDEO_EXTS = new String[] {
-            "mp4", "wmv", "mpeg", "m4v", "3gp", "3gpp", "3g2", "3gpp2", "asf"
-    };
-
-    private static String[] PICTURE_EXTS = new String[] {
-            "jpg", "jpeg", "gif", "png", "bmp", "wbmp"
-    };
 
     public static HashMap<FileCategory, FilenameExtFilter> filters = new HashMap<FileCategory, FilenameExtFilter>();
 
@@ -72,12 +74,18 @@ public enum FileCategory {
         categoryNames.put(FileCategory.Favorite, R.string.category_favorite);
     }
 
+    public static FileCategory[] sCategories = new FileCategory[] {
+            FileCategory.Music, FileCategory.Video, FileCategory.Picture, FileCategory.Theme,
+            FileCategory.Doc, FileCategory.Zip, FileCategory.Apk, FileCategory.Other
+    };
+
     private FileCategory mCategory;
 
     private Context mContext;
 
     public FileCategoryHelper(Context context) {
         mContext = context;
+
         mCategory = FileCategory.All;
     }
 
@@ -108,8 +116,6 @@ public FilenameFilter getFilter() {
 
     private HashMap<FileCategory, CategoryInfo> mCategoryInfo = new HashMap<FileCategory, CategoryInfo>();
 
-    // private IContentProvider mMediaProvider;
-
     public HashMap<FileCategory, CategoryInfo> getCategoryInfos() {
         return mCategoryInfo;
     }
@@ -130,36 +136,179 @@ public class CategoryInfo {
         public long size;
     }
 
+    private void setCategoryInfo(FileCategory fc, long count, long size) {
+        CategoryInfo info = mCategoryInfo.get(fc);
+        if (info == null) {
+            info = new CategoryInfo();
+            mCategoryInfo.put(fc, info);
+        }
+        info.count = count;
+        info.size = size;
+    }
+
+
+    private String buildDocSelection() {
+        StringBuilder selection = new StringBuilder();
+        Iterator<String> iter = Util.sDocMimeTypesSet.iterator();
+        while(iter.hasNext()) {
+            selection.append("(" + FileColumns.MIME_TYPE + "=='" + iter.next() + "') OR ");
+        }
+        return  selection.substring(0, selection.lastIndexOf(")") + 1);
+    }
+
+    private String buildSelectionByCategory(FileCategory cat) {
+        String selection = null;
+        switch (cat) {
+            case Theme:
+                selection = FileColumns.DATA + " LIKE '%.mtz'";
+                break;
+            case Doc:
+                selection = buildDocSelection();
+                break;
+            case Zip:
+                selection = "(" + FileColumns.MIME_TYPE + " == '" + Util.sZipFileMimeType + "')";
+                break;
+            case Apk:
+                selection = FileColumns.DATA + " LIKE '%.apk'";
+                break;
+            default:
+                selection = null;
+        }
+        return selection;
+    }
+
+    private Uri getContentUriByCategory(FileCategory cat) {
+        Uri uri;
+        String volumeName = "external";
+        switch(cat) {
+            case Theme:
+            case Doc:
+            case Zip:
+            case Apk:
+                uri = Files.getContentUri(volumeName);
+                break;
+            case Music:
+                uri = Audio.Media.getContentUri(volumeName);
+                break;
+            case Video:
+                uri = Video.Media.getContentUri(volumeName);
+                break;
+            case Picture:
+                uri = Images.Media.getContentUri(volumeName);
+                break;
+           default:
+               uri = null;
+        }
+        return uri;
+    }
+
+    private String buildSortOrder(SortMethod sort) {
+        String sortOrder = null;
+        switch (sort) {
+            case name:
+                sortOrder = FileColumns.TITLE + " asc";
+                break;
+            case size:
+                sortOrder = FileColumns.SIZE + " asc";
+                break;
+            case date:
+                sortOrder = FileColumns.DATE_MODIFIED + " desc";
+                break;
+            case type:
+                sortOrder = FileColumns.MIME_TYPE + " asc, " + FileColumns.TITLE + " asc";
+                break;
+        }
+        return sortOrder;
+    }
+
+    public Cursor query(FileCategory fc, SortMethod sort) {
+        Uri uri = getContentUriByCategory(fc);
+        String selection = buildSelectionByCategory(fc);
+        String sortOrder = buildSortOrder(sort);
+
+        if (uri == null) {
+            Log.e(LOG_TAG, "invalid uri, category:" + fc.name());
+            return null;
+        }
+
+        String[] columns = new String[] {
+                FileColumns._ID, FileColumns.DATA, FileColumns.SIZE, FileColumns.DATE_MODIFIED
+        };
+
+        return mContext.getContentResolver().query(uri, columns, selection, null, sortOrder);
+    }
+
+    public void refreshCategoryInfo() {
+        // clear
+        for (FileCategory fc : sCategories) {
+            setCategoryInfo(fc, 0, 0);
+        }
+
+        // query database
+        String volumeName = "external";
+
+        Uri uri = Audio.Media.getContentUri(volumeName);
+        refreshMediaCategory(FileCategory.Music, uri);
+
+        uri = Video.Media.getContentUri(volumeName);
+        refreshMediaCategory(FileCategory.Video, uri);
+
+        uri = Images.Media.getContentUri(volumeName);
+        refreshMediaCategory(FileCategory.Picture, uri);
+
+        uri = Files.getContentUri(volumeName);
+        refreshMediaCategory(FileCategory.Theme, uri);
+        refreshMediaCategory(FileCategory.Doc, uri);
+        refreshMediaCategory(FileCategory.Zip, uri);
+        refreshMediaCategory(FileCategory.Apk, uri);
+    }
+
+    private boolean refreshMediaCategory(FileCategory fc, Uri uri) {
+        String[] columns = new String[] {
+                "COUNT(*)", "SUM(_size)"
+        };
+        Cursor c = mContext.getContentResolver().query(uri, columns, buildSelectionByCategory(fc), null, null);
+        if (c == null) {
+            Log.e(LOG_TAG, "fail to query uri:" + uri);
+            return false;
+        }
+
+        if (c.moveToNext()) {
+            setCategoryInfo(fc, c.getLong(0), c.getLong(1));
+            Log.v(LOG_TAG, "Retrieved " + fc.name() + " info >>> count:" + c.getLong(0) + " size:" + c.getLong(1));
+            c.close();
+            return true;
+        }
+
+        return false;
+    }
+
     public static FileCategory getCategoryFromPath(String path) {
+        MediaFileType type = MediaFile.getFileType(path);
+        if (type != null) {
+            if (MediaFile.isAudioFileType(type.fileType)) return FileCategory.Music;
+            if (MediaFile.isVideoFileType(type.fileType)) return FileCategory.Video;
+            if (MediaFile.isImageFileType(type.fileType)) return FileCategory.Picture;
+            if (Util.sDocMimeTypesSet.contains(type.mimeType)) return FileCategory.Doc;
+        }
+
         int dotPosition = path.lastIndexOf('.');
-        if (dotPosition == -1)
+        if (dotPosition < 0) {
             return FileCategory.Other;
+        }
 
-        String ext = path.substring(dotPosition + 1, path.length());
+        String ext = path.substring(dotPosition + 1);
         if (ext.equalsIgnoreCase(APK_EXT)) {
             return FileCategory.Apk;
         }
-
         if (ext.equalsIgnoreCase(THEME_EXT)) {
             return FileCategory.Theme;
         }
 
-        if (matchExts(ext, DOCUMENT_EXTS)) {
-            return FileCategory.Doc;
-        }
-
         if (matchExts(ext, ZIP_EXTS)) {
             return FileCategory.Zip;
         }
 
-        if (matchExts(ext, VIDEO_EXTS)) {
-            return FileCategory.Video;
-        }
-
-        if (matchExts(ext, PICTURE_EXTS)) {
-            return FileCategory.Picture;
-        }
-
         return FileCategory.Other;
     }
 
diff --git a/src/net/micode/fileexplorer/FileExplorerPreferenceActivity.java b/src/net/micode/fileexplorer/FileExplorerPreferenceActivity.java
new file mode 100644
index 0000000..e2a3215
--- /dev/null
+++ b/src/net/micode/fileexplorer/FileExplorerPreferenceActivity.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * This file is part of FileExplorer.
+ *
+ * FileExplorer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FileExplorer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SwiFTP.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.micode.fileexplorer;
+
+import java.io.File;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+/**
+ *
+ * @author ShunLi
+ */
+public class FileExplorerPreferenceActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
+    private static final String PRIMARY_FOLDER = "pref_key_primary_folder";
+    private static final String READ_ROOT = "pref_key_read_root";
+    private static final String SHOW_REAL_PATH = "pref_key_show_real_path";
+    private static final String SYSTEM_SEPARATOR = File.separator;
+
+    private EditTextPreference mEditTextPreference;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences);
+
+        mEditTextPreference = (EditTextPreference) findPreference(PRIMARY_FOLDER);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        // Setup the initial values
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+
+        mEditTextPreference.setSummary(this.getString(
+                R.string.pref_primary_folder_summary,
+                sharedPreferences.getString(PRIMARY_FOLDER, GlobalConsts.ROOT_PATH)));
+
+        // Set up a listener whenever a key changes
+        sharedPreferences.registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        // Unregister the listener whenever a key changes
+        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedpreferences, String key) {
+        if (PRIMARY_FOLDER.equals(key)) {
+            mEditTextPreference.setSummary(this.getString(
+                    R.string.pref_primary_folder_summary,
+                    sharedpreferences.getString(PRIMARY_FOLDER, GlobalConsts.ROOT_PATH)));
+        }
+    }
+
+    public static String getPrimaryFolder(Context context) {
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
+        String primaryFolder = settings.getString(PRIMARY_FOLDER, context.getString(R.string.default_primary_folder, GlobalConsts.ROOT_PATH));
+
+        if (TextUtils.isEmpty(primaryFolder)) { // setting primary folder = empty("")
+            primaryFolder = GlobalConsts.ROOT_PATH;
+        }
+
+        // it's remove the end char of the home folder setting when it with the '/' at the end.
+        // if has the backslash at end of the home folder, it's has minor bug at "UpLevel" function.
+        int length = primaryFolder.length();
+        if (length > 1 && SYSTEM_SEPARATOR.equals(primaryFolder.substring(length - 1))) { // length = 1, ROOT_PATH
+            return primaryFolder.substring(0, length - 1);
+        } else {
+            return primaryFolder;
+        }
+    }
+
+    public static boolean isReadRoot(Context context) {
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
+
+        boolean isReadRootFromSetting = settings.getBoolean(READ_ROOT, false);
+        boolean isReadRootWhenSettingPrimaryFolderWithoutSdCardPrefix = !getPrimaryFolder(context).startsWith(Util.getSdDirectory());
+
+        return isReadRootFromSetting || isReadRootWhenSettingPrimaryFolderWithoutSdCardPrefix;
+    }
+    
+    public static boolean showRealPath(Context context) {
+    	SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
+    	return settings.getBoolean(SHOW_REAL_PATH, false);
+    }
+
+}
diff --git a/src/net/micode/fileexplorer/FileExplorerTabActivity.java b/src/net/micode/fileexplorer/FileExplorerTabActivity.java
index 6728bbf..6058c0a 100644
--- a/src/net/micode/fileexplorer/FileExplorerTabActivity.java
+++ b/src/net/micode/fileexplorer/FileExplorerTabActivity.java
@@ -18,13 +18,17 @@
  */
 
 package net.micode.fileexplorer;
+
 import android.app.ActionBar;
 import android.app.ActionBar.Tab;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.ActionMode;
@@ -33,6 +37,7 @@
 
 public class FileExplorerTabActivity extends Activity {
     private static final String INSTANCESTATE_TAB = "tab";
+    private static final int DEFAULT_OFFSCREEN_PAGES = 2;
     ViewPager mViewPager;
     TabsAdapter mTabsAdapter;
     ActionMode mActionMode;
@@ -43,25 +48,48 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.fragment_pager);
         mViewPager = (ViewPager) findViewById(R.id.pager);
+        mViewPager.setOffscreenPageLimit(DEFAULT_OFFSCREEN_PAGES);
 
         final ActionBar bar = getActionBar();
         bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
         bar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_HOME);
 
         mTabsAdapter = new TabsAdapter(this, mViewPager);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_category),
+                FileCategoryActivity.class, null);
         mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_sd),
                 FileViewActivity.class, null);
         mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_remote),
                 ServerControlActivity.class, null);
-        if (savedInstanceState != null) {
-            bar.setSelectedNavigationItem(savedInstanceState.getInt(INSTANCESTATE_TAB, 0));
-        }
+        bar.setSelectedNavigationItem(PreferenceManager.getDefaultSharedPreferences(this)
+                .getInt(INSTANCESTATE_TAB, Util.CATEGORY_TAB_INDEX));
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(INSTANCESTATE_TAB, getActionBar().getSelectedNavigationIndex());
+    protected void onPause() {
+        super.onPause();
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit();
+        editor.putInt(INSTANCESTATE_TAB, getActionBar().getSelectedNavigationIndex());
+        editor.commit();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        if (getActionBar().getSelectedNavigationIndex() == Util.CATEGORY_TAB_INDEX) {
+            FileCategoryActivity categoryFragement =(FileCategoryActivity) mTabsAdapter.getItem(Util.CATEGORY_TAB_INDEX);
+            if (categoryFragement.isHomePage()) {
+                reInstantiateCategoryTab();
+            } else {
+                categoryFragement.setConfigurationChanged(true);
+            }
+        }
+        super.onConfigurationChanged(newConfig);
+    }
+
+    public void reInstantiateCategoryTab() {
+        mTabsAdapter.destroyItem(mViewPager, Util.CATEGORY_TAB_INDEX,
+                mTabsAdapter.getItem(Util.CATEGORY_TAB_INDEX));
+        mTabsAdapter.instantiateItem(mViewPager, Util.CATEGORY_TAB_INDEX);
     }
 
     @Override
@@ -89,6 +117,10 @@ public ActionMode getActionMode() {
         return mActionMode;
     }
 
+    public Fragment getFragment(int tabIndex) {
+        return mTabsAdapter.getItem(tabIndex);
+    }
+
     /**
      * This is a helper class that implements the management of tabs and all
      * details of connecting a ViewPager with associated TabHost.  It relies on a
diff --git a/src/net/micode/fileexplorer/FileIconLoader.java b/src/net/micode/fileexplorer/FileIconLoader.java
index b537f1d..c01ca0a 100644
--- a/src/net/micode/fileexplorer/FileIconLoader.java
+++ b/src/net/micode/fileexplorer/FileIconLoader.java
@@ -27,7 +27,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
@@ -230,7 +229,7 @@ public void cancelRequest(ImageView view) {
      */
     private boolean loadCachedIcon(ImageView view, String path, FileCategory cate) {
         ImageHolder holder = mImageCache.get(path);
-
+        
         if (holder == null) {
             holder = ImageHolder.create(cate);
             if (holder == null)
@@ -411,7 +410,6 @@ public boolean handleMessage(Message msg) {
                 if (holder != null && holder.state == ImageHolder.NEEDED) {
                     // Assuming atomic behavior
                     holder.state = ImageHolder.LOADING;
-
                     switch (id.mCategory) {
                         case Apk:
                             Drawable icon = Util.getApkIcon(mContext, id.mPath);
diff --git a/src/net/micode/fileexplorer/FileListAdapter.java b/src/net/micode/fileexplorer/FileListAdapter.java
index 1a8ff2e..98c5c4f 100644
--- a/src/net/micode/fileexplorer/FileListAdapter.java
+++ b/src/net/micode/fileexplorer/FileListAdapter.java
@@ -28,20 +28,22 @@
 import java.util.List;
 
 public class FileListAdapter extends ArrayAdapter<FileInfo> {
-    private static final String LOG_TAG = "FileListAdapter";
-
     private LayoutInflater mInflater;
 
     private FileViewInteractionHub mFileViewInteractionHub;
 
     private FileIconHelper mFileIcon;
 
-    public FileListAdapter(Context context, int resource, List<FileInfo> objects,
-            FileViewInteractionHub f, FileIconHelper fileIcon) {
+    private Context mContext;
+
+    public FileListAdapter(Context context, int resource,
+            List<FileInfo> objects, FileViewInteractionHub f,
+            FileIconHelper fileIcon) {
         super(context, resource, objects);
         mInflater = LayoutInflater.from(context);
         mFileViewInteractionHub = f;
         mFileIcon = fileIcon;
+        mContext = context;
     }
 
     @Override
@@ -50,13 +52,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
         if (convertView != null) {
             view = convertView;
         } else {
-            view = mInflater.inflate(R.layout.file_browse_item, parent, false);
+            view = mInflater.inflate(R.layout.file_browser_item, parent, false);
         }
 
-        FileListItem listItem = (FileListItem) view;
         FileInfo lFileInfo = mFileViewInteractionHub.getItem(position);
-        listItem.bind(lFileInfo, mFileViewInteractionHub, mFileIcon);
-
+        FileListItem.setupFileListItemInfo(mContext, view, lFileInfo,
+                mFileIcon, mFileViewInteractionHub);
+        view.findViewById(R.id.file_checkbox_area).setOnClickListener(
+                new FileListItem.FileItemOnClickListener(mContext,
+                        mFileViewInteractionHub));
         return view;
     }
 }
diff --git a/src/net/micode/fileexplorer/FileListCursorAdapter.java b/src/net/micode/fileexplorer/FileListCursorAdapter.java
index 9624be6..68ece04 100644
--- a/src/net/micode/fileexplorer/FileListCursorAdapter.java
+++ b/src/net/micode/fileexplorer/FileListCursorAdapter.java
@@ -25,6 +25,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
+
 import java.util.Collection;
 import java.util.HashMap;
 
@@ -38,16 +39,19 @@ public class FileListCursorAdapter extends CursorAdapter {
 
     private HashMap<Integer, FileInfo> mFileNameList = new HashMap<Integer, FileInfo>();
 
-    public FileListCursorAdapter(Context context, Cursor cursor, FileViewInteractionHub f, FileIconHelper fileIcon) {
+    private Context mContext;
+
+    public FileListCursorAdapter(Context context, Cursor cursor,
+            FileViewInteractionHub f, FileIconHelper fileIcon) {
         super(context, cursor, false /* auto-requery */);
         mFactory = LayoutInflater.from(context);
         mFileViewInteractionHub = f;
         mFileIcon = fileIcon;
+        mContext = context;
     }
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        FileListItem listItem = (FileListItem) view;
         FileInfo fileInfo = getFileItem(cursor.getPosition());
         if (fileInfo == null) {
             // file is not existing, create a fake info
@@ -58,13 +62,15 @@ public void bindView(View view, Context context, Cursor cursor) {
             fileInfo.fileSize = cursor.getLong(FileCategoryHelper.COLUMN_SIZE);
             fileInfo.ModifiedDate = cursor.getLong(FileCategoryHelper.COLUMN_DATE);
         }
-
-        listItem.bind(fileInfo, mFileViewInteractionHub, mFileIcon);
+        FileListItem.setupFileListItemInfo(mContext, view, fileInfo, mFileIcon,
+                mFileViewInteractionHub);
+        view.findViewById(R.id.category_file_checkbox_area).setOnClickListener(
+                new FileListItem.FileItemOnClickListener(mContext, mFileViewInteractionHub));
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mFactory.inflate(R.layout.file_browse_item, parent, false);
+        return mFactory.inflate(R.layout.category_file_browser_item, parent, false);
     }
 
     @Override
@@ -109,6 +115,7 @@ public FileInfo getFileItem(int pos) {
     }
 
     private FileInfo getFileInfo(Cursor cursor) {
-        return (cursor == null || cursor.getCount() == 0) ? null : Util.GetFileInfo(cursor.getString(FileCategoryHelper.COLUMN_PATH));
+        return (cursor == null || cursor.getCount() == 0) ? null : Util
+                .GetFileInfo(cursor.getString(FileCategoryHelper.COLUMN_PATH));
     }
 }
diff --git a/src/net/micode/fileexplorer/FileListItem.java b/src/net/micode/fileexplorer/FileListItem.java
index fef787d..2542925 100644
--- a/src/net/micode/fileexplorer/FileListItem.java
+++ b/src/net/micode/fileexplorer/FileListItem.java
@@ -18,72 +18,66 @@
  */
 
 package net.micode.fileexplorer;
-import net.micode.fileexplorer.FileViewInteractionHub.Mode;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Context;
-import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-public class FileListItem extends LinearLayout {
-    private static Context mContext;
-    private static FileViewInteractionHub mFileViewInteractionHub;
-
-    public FileListItem(Context context) {
-        super(context);
-        mContext = context;
-    }
 
-    public FileListItem(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-    }
+import net.micode.fileexplorer.FileViewInteractionHub.Mode;
 
-    public final void bind(FileInfo file, FileViewInteractionHub f, FileIconHelper mFileIcon) {
-        mFileViewInteractionHub = f;
-        FileInfo lFileInfo = file;
+public class FileListItem {
+    public static void setupFileListItemInfo(Context context, View view,
+            FileInfo fileInfo, FileIconHelper fileIcon,
+            FileViewInteractionHub fileViewInteractionHub) {
 
         // if in moving mode, show selected file always
-        if (mFileViewInteractionHub.isMoveState()) {
-            lFileInfo.Selected = mFileViewInteractionHub.isFileSelected(lFileInfo.filePath);
+        if (fileViewInteractionHub.isMoveState()) {
+            fileInfo.Selected = fileViewInteractionHub.isFileSelected(fileInfo.filePath);
         }
 
-        ImageView checkbox = (ImageView) findViewById(R.id.file_checkbox);
-        if (mFileViewInteractionHub.getMode() == Mode.Pick) {
+        ImageView checkbox = (ImageView) view.findViewById(R.id.file_checkbox);
+        if (fileViewInteractionHub.getMode() == Mode.Pick) {
             checkbox.setVisibility(View.GONE);
         } else {
-            checkbox.setVisibility(mFileViewInteractionHub.canShowCheckBox() ? View.VISIBLE : View.GONE);
-            checkbox.setImageResource(lFileInfo.Selected ? R.drawable.btn_check_on_holo_light
+            checkbox.setVisibility(fileViewInteractionHub.canShowCheckBox() ? View.VISIBLE : View.GONE);
+            checkbox.setImageResource(fileInfo.Selected ? R.drawable.btn_check_on_holo_light
                     : R.drawable.btn_check_off_holo_light);
-            checkbox.setTag(lFileInfo);
-            View checkArea = findViewById(R.id.file_checkbox_area);
-            checkArea.setOnClickListener(checkClick);
-            setSelected(lFileInfo.Selected);
+            checkbox.setTag(fileInfo);
+            view.setSelected(fileInfo.Selected);
         }
 
-        Util.setText(this, R.id.file_name, lFileInfo.fileName);
-        Util.setText(this, R.id.file_count, lFileInfo.IsDir ? "(" + lFileInfo.Count + ")" : "");
-        Util.setText(this, R.id.modified_time, Util.formatDateString(mContext, lFileInfo.ModifiedDate));
-        Util.setText(this, R.id.file_size, (lFileInfo.IsDir ? "" : Util.convertStorage(lFileInfo.fileSize)));
+        Util.setText(view, R.id.file_name, fileInfo.fileName);
+        Util.setText(view, R.id.file_count, fileInfo.IsDir ? "(" + fileInfo.Count + ")" : "");
+        Util.setText(view, R.id.modified_time, Util.formatDateString(context, fileInfo.ModifiedDate));
+        Util.setText(view, R.id.file_size, (fileInfo.IsDir ? "" : Util.convertStorage(fileInfo.fileSize)));
 
-        ImageView lFileImage = (ImageView) findViewById(R.id.file_image);
-        ImageView lFileImageFrame = (ImageView) findViewById(R.id.file_image_frame);
+        ImageView lFileImage = (ImageView) view.findViewById(R.id.file_image);
+        ImageView lFileImageFrame = (ImageView) view.findViewById(R.id.file_image_frame);
 
-        if (lFileInfo.IsDir) {
+        if (fileInfo.IsDir) {
             lFileImageFrame.setVisibility(View.GONE);
             lFileImage.setImageResource(R.drawable.folder);
         } else {
-            mFileIcon.setIcon(lFileInfo, lFileImage, lFileImageFrame);
+            fileIcon.setIcon(fileInfo, lFileImage, lFileImageFrame);
         }
     }
 
-    private OnClickListener checkClick = new OnClickListener() {
+    public static class FileItemOnClickListener implements OnClickListener {
+        private Context mContext;
+        private FileViewInteractionHub mFileViewInteractionHub;
+
+        public FileItemOnClickListener(Context context,
+                FileViewInteractionHub fileViewInteractionHub) {
+            mContext = context;
+            mFileViewInteractionHub = fileViewInteractionHub;
+        }
 
         @Override
         public void onClick(View v) {
@@ -94,7 +88,9 @@ public void onClick(View v) {
             tag.Selected = !tag.Selected;
             ActionMode actionMode = ((FileExplorerTabActivity) mContext).getActionMode();
             if (actionMode == null) {
-                actionMode = startActionMode(new ModeCallback());
+                actionMode = ((FileExplorerTabActivity) mContext)
+                        .startActionMode(new ModeCallback(mContext,
+                                mFileViewInteractionHub));
                 ((FileExplorerTabActivity) mContext).setActionMode(actionMode);
             } else {
                 actionMode.invalidate();
@@ -105,14 +101,15 @@ public void onClick(View v) {
             } else {
                 tag.Selected = !tag.Selected;
             }
-
-            Util.updateActionModeTitle(actionMode, mContext, mFileViewInteractionHub
-                    .getSelectedFileList().size());
+            Util.updateActionModeTitle(actionMode, mContext,
+                    mFileViewInteractionHub.getSelectedFileList().size());
         }
-    };
+    }
 
     public static class ModeCallback implements ActionMode.Callback {
         private Menu mMenu;
+        private Context mContext;
+        private FileViewInteractionHub mFileViewInteractionHub;
 
         private void initMenuItemSelectAllOrCancel() {
             boolean isSelectedAll = mFileViewInteractionHub.isSelectedAll();
@@ -120,6 +117,19 @@ private void initMenuItemSelectAllOrCancel() {
             mMenu.findItem(R.id.action_select_all).setVisible(!isSelectedAll);
         }
 
+        private void scrollToSDcardTab() {
+            ActionBar bar = ((FileExplorerTabActivity) mContext).getActionBar();
+            if (bar.getSelectedNavigationIndex() != Util.SDCARD_TAB_INDEX) {
+                bar.setSelectedNavigationItem(Util.SDCARD_TAB_INDEX);
+            }
+        }
+
+        public ModeCallback(Context context,
+                FileViewInteractionHub fileViewInteractionHub) {
+            mContext = context;
+            mFileViewInteractionHub = fileViewInteractionHub;
+        }
+
         @Override
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             MenuInflater inflater = ((Activity) mContext).getMenuInflater();
@@ -133,23 +143,33 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
             mMenu.findItem(R.id.action_copy_path).setVisible(
                     mFileViewInteractionHub.getSelectedFileList().size() == 1);
+            mMenu.findItem(R.id.action_cancel).setVisible(
+            		mFileViewInteractionHub.isSelected());
+            mMenu.findItem(R.id.action_select_all).setVisible(
+            		!mFileViewInteractionHub.isSelectedAll());
             return true;
         }
 
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            switch(item.getItemId()) {
+            switch (item.getItemId()) {
                 case R.id.action_delete:
                     mFileViewInteractionHub.onOperationDelete();
                     mode.finish();
                     break;
                 case R.id.action_copy:
-                    mFileViewInteractionHub.onOperationCopy();
+                    ((FileViewActivity) ((FileExplorerTabActivity) mContext)
+                            .getFragment(Util.SDCARD_TAB_INDEX))
+                            .copyFile(mFileViewInteractionHub.getSelectedFileList());
                     mode.finish();
+                    scrollToSDcardTab();
                     break;
                 case R.id.action_move:
-                    mFileViewInteractionHub.onOperationMove();
+                    ((FileViewActivity) ((FileExplorerTabActivity) mContext)
+                            .getFragment(Util.SDCARD_TAB_INDEX))
+                            .moveToFile(mFileViewInteractionHub.getSelectedFileList());
                     mode.finish();
+                    scrollToSDcardTab();
                     break;
                 case R.id.action_send:
                     mFileViewInteractionHub.onOperationSend();
diff --git a/src/net/micode/fileexplorer/FileViewActivity.java b/src/net/micode/fileexplorer/FileViewActivity.java
index 086d9ac..2678bb5 100644
--- a/src/net/micode/fileexplorer/FileViewActivity.java
+++ b/src/net/micode/fileexplorer/FileViewActivity.java
@@ -19,8 +19,10 @@
 
 package net.micode.fileexplorer;
 
-import net.micode.fileexplorer.FileExplorerTabActivity.IBackPressedListener;
-import net.micode.fileexplorer.FileViewInteractionHub.Mode;
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -41,14 +43,13 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import java.io.File;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
+import net.micode.fileexplorer.FileExplorerTabActivity.IBackPressedListener;
+import net.micode.fileexplorer.FileViewInteractionHub.Mode;
 
-public class FileViewActivity extends Fragment implements IFileInteractionListener, IBackPressedListener {
+public class FileViewActivity extends Fragment implements
+        IFileInteractionListener, IBackPressedListener {
 
-    public static final String EXT_FILETER_KEY = "ext_filter";
+    public static final String EXT_FILTER_KEY = "ext_filter";
 
     private static final String LOG_TAG = "FileViewActivity";
 
@@ -75,6 +76,8 @@ public class FileViewActivity extends Fragment implements IFileInteractionListen
 
     private View mRootView;
 
+    private static final String sdDir = Util.getSdDirectory();
+
     // memorize the scroll positions of previous paths
     private ArrayList<PathScrollPositionItem> mScrollPositionList = new ArrayList<PathScrollPositionItem>();
     private String mPreviousPath;
@@ -114,7 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
             boolean pickFolder = intent.getBooleanExtra(PICK_FOLDER, false);
             if (!pickFolder) {
-                String[] exts = intent.getStringArrayExtra(EXT_FILETER_KEY);
+                String[] exts = intent.getStringArrayExtra(EXT_FILTER_KEY);
                 if (exts != null) {
                     mFileCagetoryHelper.setCustomCategory(exts);
                 }
@@ -146,32 +149,33 @@ public void onClick(View v) {
 
         mFileListView = (ListView) mRootView.findViewById(R.id.file_path_list);
         mFileIconHelper = new FileIconHelper(mActivity);
-        mAdapter = new FileListAdapter(mActivity, R.layout.file_browse_item, mFileNameList, mFileViewInteractionHub,
+        mAdapter = new FileListAdapter(mActivity, R.layout.file_browser_item, mFileNameList, mFileViewInteractionHub,
                 mFileIconHelper);
 
-        boolean baseSd = intent.getBooleanExtra(GlobalConsts.KEY_BASE_SD, true);
-        final String sdDir = Util.getSdDirectory();
+        boolean baseSd = intent.getBooleanExtra(GlobalConsts.KEY_BASE_SD, !FileExplorerPreferenceActivity.isReadRoot(mActivity));
+        Log.i(LOG_TAG, "baseSd = " + baseSd);
 
         String rootDir = intent.getStringExtra(ROOT_DIRECTORY);
         if (!TextUtils.isEmpty(rootDir)) {
-            if (baseSd && sdDir.startsWith(rootDir)) {
-                rootDir = sdDir;
+            if (baseSd && this.sdDir.startsWith(rootDir)) {
+                rootDir = this.sdDir;
             }
         } else {
-            rootDir = baseSd ? sdDir : GlobalConsts.ROOT_PATH;
+            rootDir = baseSd ? this.sdDir : GlobalConsts.ROOT_PATH;
         }
         mFileViewInteractionHub.setRootPath(rootDir);
 
-        String currentDir = null;
+        String currentDir = FileExplorerPreferenceActivity.getPrimaryFolder(mActivity);
         Uri uri = intent.getData();
         if (uri != null) {
-            if (baseSd && sdDir.startsWith(uri.getPath())) {
-                currentDir = sdDir;
+            if (baseSd && this.sdDir.startsWith(uri.getPath())) {
+                currentDir = this.sdDir;
             } else {
                 currentDir = uri.getPath();
             }
-            mFileViewInteractionHub.setCurrentPath(currentDir);
         }
+        mFileViewInteractionHub.setCurrentPath(currentDir);
+        Log.i(LOG_TAG, "CurrentDir = " + currentDir);
 
         mBackspaceExit = (uri != null)
                 && (TextUtils.isEmpty(action)
@@ -211,7 +215,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
     @Override
     public boolean onBack() {
-        return !mBackspaceExit && mFileViewInteractionHub.onBackPressed();
+        if (mBackspaceExit || !Util.isSDCardReady() || mFileViewInteractionHub == null) {
+            return false;
+        }
+        return mFileViewInteractionHub.onBackPressed();
     }
 
     private class PathScrollPositionItem {
@@ -242,6 +249,7 @@ private int computeScrollPosition(String path) {
                 }
             } else {
                 int i;
+                boolean isLast = false;
                 for (i = 0; i < mScrollPositionList.size(); i++) {
                     if (!path.startsWith(mScrollPositionList.get(i).path)) {
                         break;
@@ -365,34 +373,24 @@ public boolean onOperation(int id) {
         return false;
     }
 
+    //支持显示真实路径
     @Override
     public String getDisplayPath(String path) {
-        String root = mFileViewInteractionHub.getRootPath();
-
-        if (root.equals(path))
-            return getString(R.string.sd_folder);
-
-        if (!root.equals("/")) {
-            int pos = path.indexOf(root);
-            if (pos == 0) {
-                path = path.substring(root.length());
-            }
+        if (path.startsWith(this.sdDir) && !FileExplorerPreferenceActivity.showRealPath(mActivity)) {
+            return getString(R.string.sd_folder) + path.substring(this.sdDir.length());
+        } else {
+            return path;
         }
-
-        return getString(R.string.sd_folder) + path;
     }
 
     @Override
     public String getRealPath(String displayPath) {
-        String root = mFileViewInteractionHub.getRootPath();
-        if (displayPath.equals(getString(R.string.sd_folder)))
-            return root;
-
-        String ret = displayPath.substring(displayPath.indexOf("/"));
-        if (!root.equals("/")) {
-            ret = root + ret;
+        final String perfixName = getString(R.string.sd_folder);
+        if (displayPath.startsWith(perfixName)) {
+            return this.sdDir + displayPath.substring(perfixName.length());
+        } else {
+            return displayPath;
         }
-        return ret;
     }
 
     @Override
@@ -410,7 +408,9 @@ public void copyFile(ArrayList<FileInfo> files) {
     }
 
     public void refresh() {
-        mFileViewInteractionHub.refreshFileList();
+        if (mFileViewInteractionHub != null) {
+            mFileViewInteractionHub.refreshFileList();
+        }
     }
 
     public void moveToFile(ArrayList<FileInfo> files) {
@@ -431,6 +431,15 @@ public FileIconHelper getFileIconHelper() {
         return mFileIconHelper;
     }
 
+    public boolean setPath(String location) {
+        if (!location.startsWith(mFileViewInteractionHub.getRootPath())) {
+            return false;
+        }
+        mFileViewInteractionHub.setCurrentPath(location);
+        mFileViewInteractionHub.refreshFileList();
+        return true;
+    }
+
     @Override
     public FileInfo getItem(int pos) {
         if (pos < 0 || pos > mFileNameList.size() - 1)
@@ -439,6 +448,7 @@ public FileInfo getItem(int pos) {
         return mFileNameList.get(pos);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void sortCurrentList(FileSortHelper sort) {
         Collections.sort(mFileNameList, sort.getComparator());
diff --git a/src/net/micode/fileexplorer/FileViewInteractionHub.java b/src/net/micode/fileexplorer/FileViewInteractionHub.java
index 6e9655b..8073715 100644
--- a/src/net/micode/fileexplorer/FileViewInteractionHub.java
+++ b/src/net/micode/fileexplorer/FileViewInteractionHub.java
@@ -19,12 +19,10 @@
 
 package net.micode.fileexplorer;
 
-import net.micode.fileexplorer.FileListItem.ModeCallback;
-import net.micode.fileexplorer.FileOperationHelper.IOperationProgressListener;
-import net.micode.fileexplorer.FileSortHelper.SortMethod;
-import net.micode.fileexplorer.FileViewActivity.SelectFilesCallback;
-import net.micode.fileexplorer.TextInputDialog.OnFinishListener;
+import java.io.File;
+import java.util.ArrayList;
 
+import android.R.drawable;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -37,9 +35,9 @@
 import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.ActionMode;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -58,8 +56,11 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.io.File;
-import java.util.ArrayList;
+import net.micode.fileexplorer.FileListItem.ModeCallback;
+import net.micode.fileexplorer.FileOperationHelper.IOperationProgressListener;
+import net.micode.fileexplorer.FileSortHelper.SortMethod;
+import net.micode.fileexplorer.FileViewActivity.SelectFilesCallback;
+import net.micode.fileexplorer.TextInputDialog.OnFinishListener;
 
 public class FileViewInteractionHub implements IOperationProgressListener {
     private static final String LOG_TAG = "FileViewInteractionHub";
@@ -120,6 +121,18 @@ private void showConfirmOperationBar(boolean show) {
         mConfirmOperationBar.setVisibility(show ? View.VISIBLE : View.GONE);
     }
 
+    public void addContextMenuSelectedItem() {
+        if (mCheckedFileNameList.size() == 0) {
+            int pos = mListViewContextMenuSelectedItem;
+            if (pos != -1) {
+                FileInfo fileInfo = mFileViewListener.getItem(pos);
+                if (fileInfo != null) {
+                    mCheckedFileNameList.add(fileInfo);
+                }
+            }
+        }
+    }
+
     public ArrayList<FileInfo> getSelectedFileList() {
         return mCheckedFileNameList;
     }
@@ -176,7 +189,6 @@ private void setupNaivgationBar() {
         setupClick(mNavigationBar, R.id.path_pane_up_level);
     }
 
-    // ////////////////////////////////////////////////////////////////////////
     // buttons
     private void setupOperationPane() {
         mConfirmOperationBar = mFileViewListener.getViewById(R.id.moving_operation_bar);
@@ -244,6 +256,17 @@ private void onOperationFavorite() {
         onOperationFavorite(path);
     }
 
+    private void onOperationSetting() {
+        Intent intent = new Intent(mContext, FileExplorerPreferenceActivity.class);
+        if (intent != null) {
+            try {
+                mContext.startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Log.e(LOG_TAG, "fail to start setting: " + e.toString());
+            }
+        }
+    }
+
     private void onOperationFavorite(String path) {
         FavoriteDatabaseHelper databaseHelper = FavoriteDatabaseHelper.getInstance();
         if (databaseHelper != null) {
@@ -282,7 +305,7 @@ public void onOperationSelectAll() {
         FileExplorerTabActivity fileExplorerTabActivity = (FileExplorerTabActivity) mContext;
         ActionMode mode = fileExplorerTabActivity.getActionMode();
         if (mode == null) {
-            mode = fileExplorerTabActivity.startActionMode(new ModeCallback());
+            mode = fileExplorerTabActivity.startActionMode(new ModeCallback(mContext, this));
             fileExplorerTabActivity.setActionMode(mode);
             Util.updateActionModeTitle(mode, mContext, getSelectedFileList().size());
         }
@@ -299,7 +322,11 @@ public void onClick(View v) {
             if (mFileViewListener.onNavigation(path))
                 return;
 
-            mCurrentPath = path;
+            if(path.isEmpty()){
+                mCurrentPath = mRoot;
+            } else{
+                mCurrentPath = path;
+            }
             refreshFileList();
         }
 
@@ -315,7 +342,7 @@ protected void onNavigationBarClick() {
             String displayPath = mFileViewListener.getDisplayPath(mCurrentPath);
             boolean root = true;
             int left = 0;
-            while (pos != -1) {
+            while (pos != -1 && !displayPath.equals("/")) {//如果当前位置在根文件夹则不显示导航条
                 int end = displayPath.indexOf("/", pos);
                 if (end == -1)
                     break;
@@ -333,6 +360,7 @@ protected void onNavigationBarClick() {
 
                 TextView text = (TextView) listItem.findViewById(R.id.path_name);
                 String substring = displayPath.substring(pos, end);
+                if(substring.isEmpty())substring = "/";
                 text.setText(substring);
 
                 listItem.setOnClickListener(navigationClick);
@@ -349,10 +377,11 @@ protected void onNavigationBarClick() {
     public boolean onOperationUpLevel() {
         showDropdownNavigation(false);
 
-        if (mFileViewListener.onOperation(GlobalConsts.OPERATION_UP_LEVEL))
-            return false;
+        if (mFileViewListener.onOperation(GlobalConsts.OPERATION_UP_LEVEL)) {
+            return true;
+        }
 
-        if (!mCurrentPath.equals(mRoot)) {
+        if (!mRoot.equals(mCurrentPath)) {
             mCurrentPath = new File(mCurrentPath).getParent();
             refreshFileList();
             return true;
@@ -475,10 +504,10 @@ private void updateConfirmButtons() {
 
     private void updateNavigationPane() {
         View upLevel = mFileViewListener.getViewById(R.id.path_pane_up_level);
-        upLevel.setVisibility(mCurrentPath.equals(mRoot) ? View.INVISIBLE : View.VISIBLE);
+        upLevel.setVisibility(mRoot.equals(mCurrentPath) ? View.INVISIBLE : View.VISIBLE);
 
         View arrow = mFileViewListener.getViewById(R.id.path_pane_arrow);
-        arrow.setVisibility(mCurrentPath.equals(mRoot) ? View.GONE : View.VISIBLE);
+        arrow.setVisibility(mRoot.equals(mCurrentPath) ? View.GONE : View.VISIBLE);
 
         mNavigationBarText.setText(mFileViewListener.getDisplayPath(mCurrentPath));
     }
@@ -640,9 +669,6 @@ public void onOperationButtonCancel() {
         }
     }
 
-    // ////////////////////////////////////////////////////////////////
-    // file list view
-
     // context menu
     private OnCreateContextMenuListener mListViewContextMenuListener = new OnCreateContextMenuListener() {
         @Override
@@ -680,7 +706,6 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         }
     };
 
-    // //////////////////////////////////////////////////
     // File List view setup
     private ListView mFileListView;
 
@@ -698,7 +723,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         });
     }
 
-    // /////////////////////////////////////////////////////////////////////
     // menu
     private static final int MENU_SEARCH = 1;
 
@@ -725,6 +749,10 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
     private static final int MENU_SELECTALL = 16;
 
+    private static final int MENU_SETTING = 17;
+
+    private static final int MENU_EXIT = 18;
+
     private OnMenuItemClickListener menuItemClick = new OnMenuItemClickListener() {
 
         @Override
@@ -737,15 +765,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 return true;
             }
 
-            if (mCheckedFileNameList.size() == 0) {
-                int pos = mListViewContextMenuSelectedItem;
-                if (pos != -1) {
-                    FileInfo fileInfo = mFileViewListener.getItem(pos);
-                    if (fileInfo != null) {
-                        mCheckedFileNameList.add(fileInfo);
-                    }
-                }
-            }
+            addContextMenuSelectedItem();
 
             switch (itemId) {
                 case MENU_SEARCH:
@@ -766,6 +786,12 @@ public boolean onMenuItemClick(MenuItem item) {
                 case GlobalConsts.MENU_FAVORITE:
                     onOperationFavorite();
                     break;
+                case MENU_SETTING:
+                    onOperationSetting();
+                    break;
+                case MENU_EXIT:
+                    ((FileExplorerTabActivity) mContext).finish();
+                    break;
                 // sort
                 case MENU_SORT_NAME:
                     item.setChecked(true);
@@ -815,6 +841,7 @@ public boolean onMenuItemClick(MenuItem item) {
             mListViewContextMenuSelectedItem = -1;
             return true;
         }
+
     };
 
     private net.micode.fileexplorer.FileViewInteractionHub.Mode mCurrentMode;
@@ -854,6 +881,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 R.drawable.ic_menu_show_sys);
         addMenuItem(menu, MENU_REFRESH, 6, R.string.operation_refresh,
                 R.drawable.ic_menu_refresh);
+        addMenuItem(menu, MENU_SETTING, 7, R.string.menu_setting, drawable.ic_menu_preferences);
+        addMenuItem(menu, MENU_EXIT, 8, R.string.menu_exit, drawable.ic_menu_close_clear_cancel);
         return true;
     }
 
@@ -918,6 +947,27 @@ public void onListItemClick(AdapterView<?> parent, View view, int position, long
             return;
         }
 
+        if (isInSelection()) {
+            boolean selected = lFileInfo.Selected;
+            ActionMode actionMode = ((FileExplorerTabActivity) mContext).getActionMode();
+            ImageView checkBox = (ImageView) view.findViewById(R.id.file_checkbox);
+            if (selected) {
+                mCheckedFileNameList.remove(lFileInfo);
+                checkBox.setImageResource(R.drawable.btn_check_off_holo_light);
+            } else {
+                mCheckedFileNameList.add(lFileInfo);
+                checkBox.setImageResource(R.drawable.btn_check_on_holo_light);
+            }
+            if (actionMode != null) {
+                if (mCheckedFileNameList.size() == 0) actionMode.finish();
+                else actionMode.invalidate();
+            }
+            lFileInfo.Selected = !selected;
+
+            Util.updateActionModeTitle(actionMode, mContext, mCheckedFileNameList.size());
+            return;
+        }
+
         if (!lFileInfo.IsDir) {
             if (mCurrentMode == Mode.Pick) {
                 mFileViewListener.onPick(lFileInfo);
@@ -979,6 +1029,10 @@ private boolean isSelectingFiles() {
     public boolean isSelectedAll() {
         return mFileViewListener.getItemCount() != 0 && mCheckedFileNameList.size() == mFileViewListener.getItemCount();
     }
+    
+    public boolean isSelected() {
+        return mCheckedFileNameList.size() != 0;
+    }
 
     public void clearSelection() {
         if (mCheckedFileNameList.size() > 0) {
diff --git a/src/net/micode/fileexplorer/IContentProvider.java b/src/net/micode/fileexplorer/IContentProvider.java
deleted file mode 100644
index b3e725f..0000000
--- a/src/net/micode/fileexplorer/IContentProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * This file is part of FileExplorer.
- *
- * FileExplorer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FileExplorer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with SwiFTP.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.micode.fileexplorer;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-
-public interface IContentProvider extends IInterface {
-    public Cursor query(Uri url, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) throws RemoteException;
-    public String getType(Uri url) throws RemoteException;
-    public Uri insert(Uri url, ContentValues initialValues)
-            throws RemoteException;
-    public int bulkInsert(Uri url, ContentValues[] initialValues) throws RemoteException;
-    public int delete(Uri url, String selection, String[] selectionArgs)
-            throws RemoteException;
-    public int update(Uri url, ContentValues values, String selection,
-            String[] selectionArgs) throws RemoteException;
-    public ParcelFileDescriptor openFile(Uri url, String mode)
-            throws RemoteException, FileNotFoundException;
-    public AssetFileDescriptor openAssetFile(Uri url, String mode)
-            throws RemoteException, FileNotFoundException;
-    public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
-            throws RemoteException, OperationApplicationException;
-    public Bundle call(String method, String arg, Bundle extras) throws RemoteException;
-
-    // Data interchange.
-    public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException;
-    public AssetFileDescriptor openTypedAssetFile(Uri url, String mimeType, Bundle opts)
-            throws RemoteException, FileNotFoundException;
-
-    /* IPC constants */
-    static final String descriptor = "android.content.IContentProvider";
-
-    static final int QUERY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION;
-    static final int GET_TYPE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 1;
-    static final int INSERT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 2;
-    static final int DELETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 3;
-    static final int UPDATE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 9;
-    static final int BULK_INSERT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 12;
-    static final int OPEN_FILE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 13;
-    static final int OPEN_ASSET_FILE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 14;
-    static final int APPLY_BATCH_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 19;
-    static final int CALL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 20;
-    static final int GET_STREAM_TYPES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 21;
-    static final int OPEN_TYPED_ASSET_FILE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 22;
-}
diff --git a/src/net/micode/fileexplorer/IFileInteractionListener.java b/src/net/micode/fileexplorer/IFileInteractionListener.java
index df221f6..9c7d305 100644
--- a/src/net/micode/fileexplorer/IFileInteractionListener.java
+++ b/src/net/micode/fileexplorer/IFileInteractionListener.java
@@ -39,6 +39,11 @@ public interface IFileInteractionListener {
 
     public boolean shouldShowOperationPane();
 
+    /**
+     * Handle operation listener.
+     * @param id
+     * @return true: indicate have operated it; false: otherwise.
+     */
     public boolean onOperation(int id);
 
     public String getDisplayPath(String path);
diff --git a/src/net/micode/fileexplorer/MediaFile.java b/src/net/micode/fileexplorer/MediaFile.java
new file mode 100644
index 0000000..2a256f7
--- /dev/null
+++ b/src/net/micode/fileexplorer/MediaFile.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * This file is part of FileExplorer.
+ *
+ * FileExplorer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FileExplorer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SwiFTP.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.micode.fileexplorer;
+
+import android.mtp.MtpConstants;
+
+import java.util.HashMap;
+
+public class MediaFile {
+
+    // Audio file types
+    public static final int FILE_TYPE_MP3 = 1;
+    public static final int FILE_TYPE_M4A = 2;
+    public static final int FILE_TYPE_WAV = 3;
+    public static final int FILE_TYPE_AMR = 4;
+    public static final int FILE_TYPE_AWB = 5;
+    public static final int FILE_TYPE_WMA = 6;
+    public static final int FILE_TYPE_OGG = 7;
+    public static final int FILE_TYPE_AAC = 8;
+    public static final int FILE_TYPE_MKA = 9;
+    public static final int FILE_TYPE_FLAC = 10;
+    private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;
+    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;
+
+    // MIDI file types
+    public static final int FILE_TYPE_MID = 11;
+    public static final int FILE_TYPE_SMF = 12;
+    public static final int FILE_TYPE_IMY = 13;
+    private static final int FIRST_MIDI_FILE_TYPE = FILE_TYPE_MID;
+    private static final int LAST_MIDI_FILE_TYPE = FILE_TYPE_IMY;
+
+    // Video file types
+    public static final int FILE_TYPE_MP4 = 21;
+    public static final int FILE_TYPE_M4V = 22;
+    public static final int FILE_TYPE_3GPP = 23;
+    public static final int FILE_TYPE_3GPP2 = 24;
+    public static final int FILE_TYPE_WMV = 25;
+    public static final int FILE_TYPE_ASF = 26;
+    public static final int FILE_TYPE_MKV = 27;
+    public static final int FILE_TYPE_MP2TS = 28;
+    public static final int FILE_TYPE_AVI = 29;
+    public static final int FILE_TYPE_WEBM = 30;
+    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;
+    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM;
+
+    // Image file types
+    public static final int FILE_TYPE_JPEG = 31;
+    public static final int FILE_TYPE_GIF = 32;
+    public static final int FILE_TYPE_PNG = 33;
+    public static final int FILE_TYPE_BMP = 34;
+    public static final int FILE_TYPE_WBMP = 35;
+    public static final int FILE_TYPE_WEBP = 36;
+    private static final int FIRST_IMAGE_FILE_TYPE = FILE_TYPE_JPEG;
+    private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WEBP;
+
+    public static class MediaFileType {
+        public final int fileType;
+        public final String mimeType;
+
+        MediaFileType(int fileType, String mimeType) {
+            this.fileType = fileType;
+            this.mimeType = mimeType;
+        }
+    }
+
+    private static HashMap<String, MediaFileType> sFileTypeMap = new HashMap<String, MediaFileType>();
+    private static HashMap<String, Integer> sMimeTypeMap = new HashMap<String, Integer>();
+
+    static void addFileType(String extension, int fileType, String mimeType) {
+        sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType));
+        sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
+    }
+
+    static void addFileType(String extension, int fileType, String mimeType, int mtpFormatCode) {
+        addFileType(extension, fileType, mimeType);
+    }
+
+    static {
+        addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);
+        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG);
+        addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV);
+        addFileType("AMR", FILE_TYPE_AMR, "audio/amr");
+        addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb");
+        addFileType("OGG", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);
+        addFileType("OGA", FILE_TYPE_OGG, "application/ogg", MtpConstants.FORMAT_OGG);
+        addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC);
+        addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC);
+        addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");
+
+        addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
+        addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
+        addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG);
+        addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG);
+        addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
+        addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);
+        addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
+        addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
+        addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");
+        addFileType("WEBM", FILE_TYPE_WEBM, "video/webm");
+        addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");
+        addFileType("AVI", FILE_TYPE_AVI, "video/avi");
+
+        addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
+        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
+        addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF);
+        addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG);
+        addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP);
+        addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp");
+        addFileType("WEBP", FILE_TYPE_WEBP, "image/webp");
+    }
+
+    public static boolean isAudioFileType(int fileType) {
+        return ((fileType >= FIRST_AUDIO_FILE_TYPE && fileType <= LAST_AUDIO_FILE_TYPE) || (fileType >= FIRST_MIDI_FILE_TYPE && fileType <= LAST_MIDI_FILE_TYPE));
+    }
+
+    public static boolean isVideoFileType(int fileType) {
+        return (fileType >= FIRST_VIDEO_FILE_TYPE && fileType <= LAST_VIDEO_FILE_TYPE);
+    }
+
+    public static boolean isImageFileType(int fileType) {
+        return (fileType >= FIRST_IMAGE_FILE_TYPE && fileType <= LAST_IMAGE_FILE_TYPE);
+    }
+
+    public static MediaFileType getFileType(String path) {
+        int lastDot = path.lastIndexOf(".");
+        if (lastDot < 0)
+            return null;
+        return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase());
+    }
+}
diff --git a/src/net/micode/fileexplorer/MimeUtils.java b/src/net/micode/fileexplorer/MimeUtils.java
index bded4f7..63a8298 100644
--- a/src/net/micode/fileexplorer/MimeUtils.java
+++ b/src/net/micode/fileexplorer/MimeUtils.java
@@ -342,6 +342,7 @@ public final class MimeUtils {
         add("video/quicktime", "qt");
         add("video/quicktime", "mov");
         add("video/vnd.mpegurl", "mxu");
+        add("video/webm", "webm");
         add("video/x-la-asf", "lsf");
         add("video/x-la-asf", "lsx");
         add("video/x-mng", "mng");
diff --git a/src/net/micode/fileexplorer/ServerControlActivity.java b/src/net/micode/fileexplorer/ServerControlActivity.java
index 873e0b7..fe5b666 100644
--- a/src/net/micode/fileexplorer/ServerControlActivity.java
+++ b/src/net/micode/fileexplorer/ServerControlActivity.java
@@ -112,6 +112,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         updateUi();
         UiUpdater.registerClient(handler);
+        
+        // quickly turn on or off wifi.
+        mRootView.findViewById(R.id.wifi_state_image).setOnClickListener(
+                new OnClickListener() {
+                    public void onClick(View v) {
+                        Intent intent = new Intent(
+                                android.provider.Settings.ACTION_WIFI_SETTINGS);
+                        startActivity(intent);
+                    }
+                });
+        
         return mRootView;
     }
 
@@ -179,7 +190,7 @@ public void updateUi() {
         String wifiId = info != null ? info.getSSID() : null;
         boolean isWifiReady = FTPServerService.isWifiEnabled();
 
-        setText(R.id.wifi_state, isWifiReady ? wifiId : getString(R.string.no_wifi));
+        setText(R.id.wifi_state, isWifiReady ? wifiId : getString(R.string.no_wifi_hint));
         ImageView wifiImg = (ImageView) mRootView.findViewById(R.id.wifi_state_image);
         wifiImg.setImageResource(isWifiReady ? R.drawable.wifi_state4 : R.drawable.wifi_state0);
 
@@ -222,7 +233,7 @@ public void updateUi() {
             startStopButtonText.setTextColor(Color.GRAY);
         }
 
-        ipText.setVisibility(running ? View.VISIBLE : View.GONE);
+        ipText.setVisibility(running ? View.VISIBLE : View.INVISIBLE);
         instructionText.setVisibility(running ? View.VISIBLE : View.GONE);
         instructionTextPre.setVisibility(running ? View.GONE : View.VISIBLE);
     }
diff --git a/src/net/micode/fileexplorer/Util.java b/src/net/micode/fileexplorer/Util.java
index ee2243c..fdb558d 100644
--- a/src/net/micode/fileexplorer/Util.java
+++ b/src/net/micode/fileexplorer/Util.java
@@ -19,16 +19,6 @@
 
 package net.micode.fileexplorer;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -44,6 +34,17 @@
 import android.view.View;
 import android.widget.TextView;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+
 public class Util {
     private static String ANDROID_SECURE = "/mnt/sdcard/.android_secure";
 
@@ -136,13 +137,21 @@ public static FileInfo GetFileInfo(File f, FilenameFilter filter, boolean showHi
         return lFileInfo;
     }
 
-    public static Drawable getApkIcon(Context context, String path) {
+    /*
+     * 采用了新的办法获取APK图标，之前的失败是因为android中存在的一个BUG,通过
+     * appInfo.publicSourceDir = apkPath;来修正这个问题，详情参见:
+     * http://code.google.com/p/android/issues/detail?id=9151
+     */
+    public static Drawable getApkIcon(Context context, String apkPath) {
         PackageManager pm = context.getPackageManager();
-        PackageInfo info = pm.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES);
+        PackageInfo info = pm.getPackageArchiveInfo(apkPath,
+                PackageManager.GET_ACTIVITIES);
         if (info != null) {
             ApplicationInfo appInfo = info.applicationInfo;
+            appInfo.sourceDir = apkPath;
+            appInfo.publicSourceDir = apkPath;
             try {
-                return pm.getApplicationIcon(appInfo);
+                return appInfo.loadIcon(pm);
             } catch (OutOfMemoryError e) {
                 Log.e(LOG_TAG, e.toString());
             }
@@ -275,6 +284,7 @@ public static ArrayList<FavoriteItem> getDefaultFavorites(Context context) {
         ArrayList<FavoriteItem> list = new ArrayList<FavoriteItem>();
         list.add(new FavoriteItem(context.getString(R.string.favorite_photo), makePath(getSdDirectory(), "DCIM/Camera")));
         list.add(new FavoriteItem(context.getString(R.string.favorite_sdcard), getSdDirectory()));
+        //list.add(new FavoriteItem(context.getString(R.string.favorite_root), getSdDirectory()));
         list.add(new FavoriteItem(context.getString(R.string.favorite_screen_cap), makePath(getSdDirectory(), "MIUI/screen_cap")));
         list.add(new FavoriteItem(context.getString(R.string.favorite_ringtone), makePath(getSdDirectory(), "MIUI/ringtone")));
         return list;
@@ -390,6 +400,25 @@ public static String formatDateString(Context context, long time) {
     public static void updateActionModeTitle(ActionMode mode, Context context, int selectedNum) {
         if (mode != null) {
             mode.setTitle(context.getString(R.string.multi_select_title,selectedNum));
+            if(selectedNum == 0){
+                mode.finish();
+            }
         }
     }
+
+    public static HashSet<String> sDocMimeTypesSet = new HashSet<String>() {
+        {
+            add("text/plain");
+            add("text/plain");
+            add("application/pdf");
+            add("application/msword");
+            add("application/vnd.ms-excel");
+            add("application/vnd.ms-excel");
+        }
+    };
+
+    public static String sZipFileMimeType = "application/zip";
+
+    public static int CATEGORY_TAB_INDEX = 0;
+    public static int SDCARD_TAB_INDEX = 1;
 }