diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b97eaa84..3d30d47bc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,7 +70,7 @@
         <activity
             android:name=".activity.FavouriteActivity"
             android:label="@string/favourite"
-            android:icon="@drawable/ic_action_favourite"
+            android:icon="@drawable/ic_action_favorite"
             android:screenOrientation="portrait"
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.ListActivity" >
diff --git a/res/drawable-hdpi/ic_action_core_overflow.png b/res/drawable-hdpi/ic_action_core_overflow.png
index 00fe9c470..a074c10d0 100644
Binary files a/res/drawable-hdpi/ic_action_core_overflow.png and b/res/drawable-hdpi/ic_action_core_overflow.png differ
diff --git a/res/drawable-hdpi/ic_action_core_overflow_dark.png b/res/drawable-hdpi/ic_action_core_overflow_dark.png
new file mode 100644
index 000000000..21544e5fb
Binary files /dev/null and b/res/drawable-hdpi/ic_action_core_overflow_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_download.png b/res/drawable-hdpi/ic_action_download.png
index 2303b48df..872b73c0a 100644
Binary files a/res/drawable-hdpi/ic_action_download.png and b/res/drawable-hdpi/ic_action_download.png differ
diff --git a/res/drawable-hdpi/ic_action_download_dark.png b/res/drawable-hdpi/ic_action_download_dark.png
new file mode 100644
index 000000000..f8818490f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_download_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_favorite.png b/res/drawable-hdpi/ic_action_favorite.png
new file mode 100644
index 000000000..37e849066
Binary files /dev/null and b/res/drawable-hdpi/ic_action_favorite.png differ
diff --git a/res/drawable-hdpi/ic_action_favorite_dark.png b/res/drawable-hdpi/ic_action_favorite_dark.png
new file mode 100644
index 000000000..40e01e330
Binary files /dev/null and b/res/drawable-hdpi/ic_action_favorite_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_favourite.png b/res/drawable-hdpi/ic_action_favourite.png
deleted file mode 100644
index 6e18326c5..000000000
Binary files a/res/drawable-hdpi/ic_action_favourite.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_home.png b/res/drawable-hdpi/ic_action_home.png
new file mode 100644
index 000000000..c70c65f7e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_home.png differ
diff --git a/res/drawable-hdpi/ic_action_home_dark.png b/res/drawable-hdpi/ic_action_home_dark.png
new file mode 100644
index 000000000..b27959bfc
Binary files /dev/null and b/res/drawable-hdpi/ic_action_home_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 000000000..ef2b3013b
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search.png differ
diff --git a/res/drawable-hdpi/ic_action_search_dark.png b/res/drawable-hdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..756937dff
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_core_overflow.png b/res/drawable-mdpi/ic_action_core_overflow.png
index 2e61c5563..b6d614fca 100644
Binary files a/res/drawable-mdpi/ic_action_core_overflow.png and b/res/drawable-mdpi/ic_action_core_overflow.png differ
diff --git a/res/drawable-mdpi/ic_action_core_overflow_dark.png b/res/drawable-mdpi/ic_action_core_overflow_dark.png
new file mode 100644
index 000000000..2485c5704
Binary files /dev/null and b/res/drawable-mdpi/ic_action_core_overflow_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_download.png b/res/drawable-mdpi/ic_action_download.png
index d4c2f27b7..935bbd45b 100644
Binary files a/res/drawable-mdpi/ic_action_download.png and b/res/drawable-mdpi/ic_action_download.png differ
diff --git a/res/drawable-mdpi/ic_action_download_dark.png b/res/drawable-mdpi/ic_action_download_dark.png
new file mode 100644
index 000000000..cc13d4446
Binary files /dev/null and b/res/drawable-mdpi/ic_action_download_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_favorite.png b/res/drawable-mdpi/ic_action_favorite.png
new file mode 100644
index 000000000..ae17f17a2
Binary files /dev/null and b/res/drawable-mdpi/ic_action_favorite.png differ
diff --git a/res/drawable-mdpi/ic_action_favorite_dark.png b/res/drawable-mdpi/ic_action_favorite_dark.png
new file mode 100644
index 000000000..f69a40afd
Binary files /dev/null and b/res/drawable-mdpi/ic_action_favorite_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_favourite.png b/res/drawable-mdpi/ic_action_favourite.png
deleted file mode 100644
index 54f32baa7..000000000
Binary files a/res/drawable-mdpi/ic_action_favourite.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_home.png b/res/drawable-mdpi/ic_action_home.png
new file mode 100644
index 000000000..4998bc797
Binary files /dev/null and b/res/drawable-mdpi/ic_action_home.png differ
diff --git a/res/drawable-mdpi/ic_action_home_dark.png b/res/drawable-mdpi/ic_action_home_dark.png
new file mode 100644
index 000000000..cdbe08e01
Binary files /dev/null and b/res/drawable-mdpi/ic_action_home_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 000000000..076085c57
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search.png differ
diff --git a/res/drawable-mdpi/ic_action_search_dark.png b/res/drawable-mdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..026c8498f
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_core_overflow.png b/res/drawable-xhdpi/ic_action_core_overflow.png
index af7db7be3..7be3c2a4f 100644
Binary files a/res/drawable-xhdpi/ic_action_core_overflow.png and b/res/drawable-xhdpi/ic_action_core_overflow.png differ
diff --git a/res/drawable-xhdpi/ic_action_core_overflow_dark.png b/res/drawable-xhdpi/ic_action_core_overflow_dark.png
new file mode 100644
index 000000000..817651d71
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_core_overflow_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_download.png b/res/drawable-xhdpi/ic_action_download.png
index 67df9c007..6b6c65df8 100644
Binary files a/res/drawable-xhdpi/ic_action_download.png and b/res/drawable-xhdpi/ic_action_download.png differ
diff --git a/res/drawable-xhdpi/ic_action_download_dark.png b/res/drawable-xhdpi/ic_action_download_dark.png
new file mode 100644
index 000000000..c8caf90b4
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_download_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_favorite.png b/res/drawable-xhdpi/ic_action_favorite.png
new file mode 100644
index 000000000..849e3eb90
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_favorite.png differ
diff --git a/res/drawable-xhdpi/ic_action_favorite_dark.png b/res/drawable-xhdpi/ic_action_favorite_dark.png
new file mode 100644
index 000000000..78b2af806
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_favorite_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_favourite.png b/res/drawable-xhdpi/ic_action_favourite.png
deleted file mode 100644
index 726148a87..000000000
Binary files a/res/drawable-xhdpi/ic_action_favourite.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_home.png b/res/drawable-xhdpi/ic_action_home.png
new file mode 100644
index 000000000..88532252a
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_home.png differ
diff --git a/res/drawable-xhdpi/ic_action_home_dark.png b/res/drawable-xhdpi/ic_action_home_dark.png
new file mode 100644
index 000000000..d5b7ffbfb
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_home_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 000000000..1ae3dff0e
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/res/drawable-xhdpi/ic_action_search_dark.png b/res/drawable-xhdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..705074bde
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_core_overflow.png b/res/drawable-xxhdpi/ic_action_core_overflow.png
index 94200c4a9..a0cb8a418 100644
Binary files a/res/drawable-xxhdpi/ic_action_core_overflow.png and b/res/drawable-xxhdpi/ic_action_core_overflow.png differ
diff --git a/res/drawable-xxhdpi/ic_action_core_overflow_dark.png b/res/drawable-xxhdpi/ic_action_core_overflow_dark.png
new file mode 100644
index 000000000..7a1639ef2
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_core_overflow_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_download.png b/res/drawable-xxhdpi/ic_action_download.png
index 56292e091..03ddef9f5 100644
Binary files a/res/drawable-xxhdpi/ic_action_download.png and b/res/drawable-xxhdpi/ic_action_download.png differ
diff --git a/res/drawable-xxhdpi/ic_action_download_dark.png b/res/drawable-xxhdpi/ic_action_download_dark.png
new file mode 100644
index 000000000..c487580c4
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_download_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_favorite.png b/res/drawable-xxhdpi/ic_action_favorite.png
new file mode 100644
index 000000000..972bdc42e
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_favorite.png differ
diff --git a/res/drawable-xxhdpi/ic_action_favorite_dark.png b/res/drawable-xxhdpi/ic_action_favorite_dark.png
new file mode 100644
index 000000000..5acb79aaf
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_favorite_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_favourite.png b/res/drawable-xxhdpi/ic_action_favourite.png
deleted file mode 100644
index c4a0c5d5b..000000000
Binary files a/res/drawable-xxhdpi/ic_action_favourite.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_home.png b/res/drawable-xxhdpi/ic_action_home.png
new file mode 100644
index 000000000..b623bb585
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_home.png differ
diff --git a/res/drawable-xxhdpi/ic_action_home_dark.png b/res/drawable-xxhdpi/ic_action_home_dark.png
new file mode 100644
index 000000000..f995a65f0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_home_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
index 934525e43..500ac03ad 100644
Binary files a/res/drawable-xxhdpi/ic_action_search.png and b/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/res/drawable-xxhdpi/ic_action_search_dark.png b/res/drawable-xxhdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..fa64f9e84
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_search_dark.png differ
diff --git a/res/drawable/ic_action_core_overflow_selector.xml b/res/drawable/ic_action_core_overflow_selector.xml
new file mode 100644
index 000000000..a1c95f27d
--- /dev/null
+++ b/res/drawable/ic_action_core_overflow_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_action_core_overflow_dark" />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_action_core_overflow_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_action_core_overflow_dark" />
+    <item
+        android:drawable="@drawable/ic_action_core_overflow" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/shadow.xml b/res/drawable/shadow.xml
index 67bb1c57f..589a4e020 100644
--- a/res/drawable/shadow.xml
+++ b/res/drawable/shadow.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <gradient
-        android:endColor="#33000000"
-        android:centerColor="#11000000"
+        android:endColor="#22000000"
+        android:centerColor="#08000000"
         android:startColor="#00000000" />
 
 </shape>
\ No newline at end of file
diff --git a/res/layout/detail_normal.xml b/res/layout/detail_normal.xml
index e1138a43e..8ac7e9a47 100644
--- a/res/layout/detail_normal.xml
+++ b/res/layout/detail_normal.xml
@@ -73,10 +73,10 @@
         
     </RelativeLayout>
     
-    <ImageView
+    <View
         android:layout_width="fill_parent"
         android:layout_height="1.0dp"
-        android:src="@color/detail_divider" />
+        android:background="@color/detail_divider" />
 
     <LinearLayout
         android:id="@+id/tags_layout"
@@ -86,10 +86,10 @@
         android:layout_margin="2.0dp" >
     </LinearLayout>
     
-    <ImageView
+    <View
         android:layout_width="fill_parent"
         android:layout_height="1.0dp"
-        android:src="@color/detail_divider" />
+        android:background="@color/detail_divider" />
     
     <include
         layout="@layout/page_list"
diff --git a/res/layout/list.xml b/res/layout/list.xml
index 3a324d496..bec79b3ea 100644
--- a/res/layout/list.xml
+++ b/res/layout/list.xml
@@ -6,13 +6,6 @@
         android:id="@+id/list_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
-
-    <!-- 
-            android:divider="@null"
-        android:listSelector="@android:color/transparent"
-        android:cacheColorHint="@color/main_background"
-        android:clipToPadding="false"
-        android:fitsSystemWindows="true"  -->
     
     <ProgressBar
         android:id="@+id/list_wait_first"
diff --git a/res/layout/list_menu_list.xml b/res/layout/list_menu_list.xml
index 2a3a5e5d2..b3a6ff927 100644
--- a/res/layout/list_menu_list.xml
+++ b/res/layout/list_menu_list.xml
@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/main_background"
+    android:background="@android:color/holo_blue_dark"
     android:orientation="vertical" >
     
     
@@ -18,12 +18,20 @@
         
     </ListView>
     
+    <View
+        android:id="@+id/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1.0dp"
+        android:background="@color/detail_divider" />
+    
     <com.hippo.ehviewer.view.TagListView
         android:id="@+id/list_menu_tag_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:choiceMode="singleChoice"
         android:clickable="true"
+        android:divider="@color/detail_divider"
+        android:dividerHeight="1.0dp"
         android:scrollbarThumbVertical="@drawable/scrollbar_white" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index 0ceb4e8df..f7cbd2505 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -2,9 +2,9 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textSize="@dimen/title_large"
     android:gravity="center_vertical"
-    android:paddingLeft="18dp"
-    android:minHeight="48dp"
-    android:textColor="@android:color/black"
+    android:paddingLeft="10dp"
+    android:minHeight="56dp"
+    android:textColor="@android:color/white"
     android:singleLine="true" />
\ No newline at end of file
diff --git a/res/layout/menu_tag.xml b/res/layout/menu_tag.xml
new file mode 100644
index 000000000..1c7601714
--- /dev/null
+++ b/res/layout/menu_tag.xml
@@ -0,0 +1,10 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="@dimen/title_medium"
+    android:gravity="center_vertical"
+    android:paddingLeft="18dp"
+    android:minHeight="48dp"
+    android:textColor="@android:color/white"
+    android:singleLine="true" />
\ No newline at end of file
diff --git a/res/menu/detail.xml b/res/menu/detail.xml
index d6b716fb8..6a883b6ae 100644
--- a/res/menu/detail.xml
+++ b/res/menu/detail.xml
@@ -3,7 +3,7 @@
     <item
         android:id="@+id/action_favourite"
         android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_favourite"
+        android:icon="@drawable/ic_action_favorite"
         android:title="@string/favourite"/>
     
     <item
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 44ad1addc..7aaa55ce8 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,5 +1,5 @@
 <resources>
     
-    <dimen name="menu_offset">400dp</dimen>
+    <dimen name="menu_offset">240dp</dimen>
 
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a967a9228..6acd8d628 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -8,6 +8,13 @@
         <item>@string/download</item>
     </string-array>
     
+    <integer-array name="list_list_icon">
+        <item>@drawable/ic_action_home</item>
+        <item>@drawable/ic_action_home</item>
+        <item>@drawable/ic_action_home</item>
+        <item>@drawable/ic_action_home</item>
+    </integer-array>
+    
     <string-array name="min_rating">
         <item>@string/star_2</item>
         <item>@string/star_3</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 509e3ea49..2572bf5b5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -3,8 +3,11 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     
-    <dimen name="shadow_width">15dp</dimen>
-    <dimen name="slidingmenu_offset">200dp</dimen>
+    <dimen name="shadow_width">12dp</dimen>
+    <dimen name="menu_offset">240dp</dimen>
+    
+    <dimen name="title_large">20.0sp</dimen>
+    <dimen name="title_medium">18.0sp</dimen>
     
     <dimen name="text_xlarge">18.0sp</dimen>
     <dimen name="text_large">16.0sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 94f8e45e0..61e8395b7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,7 +13,7 @@
     </style>
     
     <style name="OverFlow" parent="@android:style/Widget.Holo.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_action_core_overflow</item>
+        <item name="android:src">@drawable/ic_action_core_overflow_selector</item>
     </style>
     
     <style name="PopupMenu" parent="@android:style/Widget.Holo.Light.ListPopupWindow">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0446455eb..abb4aad5d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -17,7 +17,7 @@
         <!-- item name="@android:listDivider">@drawable/list_divider</item -->
         
         <!-- No action bar shadow -->
-        <item name="android:windowContentOverlay">@null</item>
+        <!-- item name="android:windowContentOverlay">@drawable/shadow</item -->
     </style>
     
     <style name="AppTheme.NoActionBar">
diff --git a/src/com/hippo/ehviewer/AppContext.java b/src/com/hippo/ehviewer/AppContext.java
index d8bf3efed..c5bcfbfa0 100644
--- a/src/com/hippo/ehviewer/AppContext.java
+++ b/src/com/hippo/ehviewer/AppContext.java
@@ -13,6 +13,7 @@ import com.hippo.ehviewer.util.Crash;
 import com.hippo.ehviewer.util.Download;
 import com.hippo.ehviewer.util.ThreadPool;
 import com.hippo.ehviewer.util.Ui;
+import com.hippo.ehviewer.widget.LoadImageView;
 
 import android.app.Application;
 
@@ -25,7 +26,7 @@ public class AppContext extends Application implements UncaughtExceptionHandler
     
     private Data mData;
     private EhClient mEhClient;
-    
+    private ImageGeterManager mImageGeterManager;
     private ThreadPool mNetworkThreadPool;
     
     @Override
@@ -45,6 +46,8 @@ public class AppContext extends Application implements UncaughtExceptionHandler
         
         mData = new Data(this);
         HttpHelper.setCookieHelper(this);
+        mImageGeterManager = new ImageGeterManager(this, Cache.memoryCache, Cache.cpCache);
+        LoadImageView.setImageGeterManager(mImageGeterManager);
         
         mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
         Thread.setDefaultUncaughtExceptionHandler(this);
@@ -74,6 +77,10 @@ public class AppContext extends Application implements UncaughtExceptionHandler
         return mData;
     }
     
+    public ImageGeterManager getImageGeterManager() {
+        return mImageGeterManager;
+    }
+    
     @Override
     public void uncaughtException(Thread thread, Throwable ex) {
         if (!handleException(ex) && mDefaultHandler != null) {
diff --git a/src/com/hippo/ehviewer/ImageLoadManager.java b/src/com/hippo/ehviewer/ImageGeterManager.java
similarity index 55%
rename from src/com/hippo/ehviewer/ImageLoadManager.java
rename to src/com/hippo/ehviewer/ImageGeterManager.java
index 2683a0986..b7bae6597 100644
--- a/src/com/hippo/ehviewer/ImageLoadManager.java
+++ b/src/com/hippo/ehviewer/ImageGeterManager.java
@@ -3,6 +3,7 @@ package com.hippo.ehviewer;
 import java.util.Stack;
 
 import com.hippo.ehviewer.network.HttpHelper;
+import com.hippo.ehviewer.util.Constants;
 import com.hippo.ehviewer.util.Ui;
 import com.hippo.ehviewer.util.Util;
 import com.hippo.ehviewer.widget.LoadImageView;
@@ -12,22 +13,27 @@ import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.util.LruCache;
+
 import com.hippo.ehviewer.util.Log;
 
-public class ImageLoadManager {
-    private static final String TAG = "ImageLoadManager";
+public class ImageGeterManager {
+    private static final String TAG = "ImageGeterManager";
     
     private static final int WAIT = 0x0;
     private static final int TOUCH = 0x1;
     private static final int CONTEXT = 0x2;
     
     private class LoadTask {
-        public LoadImageView liv;
+        public String url;
+        public String key;
+        public OnGetImageListener listener;
         public boolean download;
         public Bitmap bitmap;
         
-        public LoadTask(LoadImageView liv, boolean download) {
-            this.liv = liv;
+        public LoadTask(String url, String key, OnGetImageListener listener, boolean download) {
+            this.url = url;
+            this.key = key;
+            this.listener = listener;
             this.download = download;
         }
     }
@@ -40,30 +46,25 @@ public class ImageLoadManager {
     private DiskCache mDiskCache;
     
     private LoadTask curLoadTask;
-    private final LoadTask emptyLoadTask = new LoadTask(null, false);
+    private final LoadTask emptyLoadTask = new LoadTask(null, null, null, false);
     
-    private static final Handler loadImageHandler = 
+    private static final Handler mHandler = 
             new Handler() {
                 @Override
                 public void handleMessage(Message msg) {
                     LoadTask task = (LoadTask)msg.obj;
                     switch (msg.what) {
-                    case WAIT:
-                        //task.liv.setWaitImage();
+                    case Constants.TRUE:
+                        task.listener.onGetImageSuccess(task.key, task.bitmap);
                         break;
-                        
-                    case TOUCH:
-                        task.liv.setTouchImage();
-                        break;
-                        
-                    case CONTEXT:
-                        task.liv.setContextImage(task.bitmap);
+                    case Constants.FALSE:
+                        task.listener.onGetImageFail(task.key);
                         break;
                     }
                 }
             };
     
-    public ImageLoadManager(Context context, LruCache<String, Bitmap> memoryCache,
+    public ImageGeterManager(Context context, LruCache<String, Bitmap> memoryCache,
             DiskCache diskCache) {
         mLoadCacheTask = new Stack<LoadTask>();
         mImageDownloadTask = new ImageDownloadManager();
@@ -73,9 +74,8 @@ public class ImageLoadManager {
         mDiskCache = diskCache;
     }
     
-    public synchronized void add(LoadImageView liv, boolean download) {
-        liv.setState(LoadImageView.LOADING);
-        mLoadCacheTask.push(new LoadTask(liv, download));
+    public synchronized void add(String url, String key, OnGetImageListener listener, boolean download) {
+        mLoadCacheTask.push(new LoadTask(url, key, listener, download));
         if (curLoadTask == null) {
             curLoadTask = emptyLoadTask;
             new Thread(new LoadFromCacheTask()).start();
@@ -86,39 +86,41 @@ public class ImageLoadManager {
         @Override
         public void run() {
             while (true) {
-                synchronized (ImageLoadManager.this) {
+                synchronized (ImageGeterManager.this) {
                     if (mLoadCacheTask.isEmpty()) {
                         curLoadTask = null;
                         break;
                     }
                     curLoadTask = mLoadCacheTask.pop();
                 }
-                LoadImageView liv = curLoadTask.liv;
-                String key = liv.getKey();
-                Bitmap bitmap = null;
-                if (mMemoryCache == null || (bitmap = mMemoryCache.get(key)) == null) {
+                
+                // Continue if do not need any more
+                if (!curLoadTask.listener.onGetImage(curLoadTask.key))
+                    continue;
+                
+                String key = curLoadTask.key;
+                if (mMemoryCache == null || (curLoadTask.bitmap = mMemoryCache.get(key)) == null) {
                     if (mDiskCache != null
-                            && (bitmap = (Bitmap)mDiskCache.get(key, Util.BITMAP)) != null
+                            && (curLoadTask.bitmap = (Bitmap)mDiskCache.get(key, Util.BITMAP)) != null
                             && mMemoryCache != null)
-                        mMemoryCache.put(key, bitmap);
+                        mMemoryCache.put(key, curLoadTask.bitmap);
                 }
                 
-                Message msg = new Message();
-                msg.obj = curLoadTask;
-                if (bitmap == null) { // Load from cache error
-                    if (curLoadTask.download) {
+                if (curLoadTask.bitmap == null) {
+                    if (curLoadTask.download)
                         mImageDownloadTask.add(curLoadTask);
-                    }
                     else {
-                        liv.setState(LoadImageView.FAIL);
+                        Message msg = new Message();
+                        msg.what = Constants.FALSE;
+                        msg.obj = curLoadTask;
+                        mHandler.sendMessage(msg);
                     }
-                    msg.what = WAIT;
                 } else {
-                    curLoadTask.bitmap = bitmap;
-                    liv.setState(LoadImageView.LOADED);
-                    msg.what = CONTEXT;
+                    Message msg = new Message();
+                    msg.what = Constants.TRUE;
+                    msg.obj = curLoadTask;
+                    mHandler.sendMessage(msg);
                 }
-                loadImageHandler.sendMessage(msg);
             }
         }
     }
@@ -157,25 +159,37 @@ public class ImageLoadManager {
                         }
                         loadTask = mDownloadTask.pop();
                     }
-                    LoadImageView liv = loadTask.liv;
-                    Bitmap bitmap = httpHelper.getImage(liv.getUrl(),
-                            liv.getKey(), mMemoryCache, mDiskCache, true);
+                    
+                    // Continue if do not need any more
+                    if (!loadTask.listener.onGetImage(loadTask.key))
+                        continue;
+                    
+                    loadTask.bitmap = httpHelper.getImage(loadTask.url,
+                            loadTask.key, mMemoryCache, mDiskCache, true);
+                    
+                    // Continue if do not need any more
+                    if (!loadTask.listener.onGetImage(loadTask.key))
+                        continue;
                     
                     Message msg = new Message();
                     msg.obj = loadTask;
-                    if (bitmap == null) {
-                        Log.d(TAG, httpHelper.getEMsg());
-                        liv.setState(LoadImageView.FAIL);
-                        liv.setOnClickListener(ImageLoadManager.this);
-                        msg.what = TOUCH;
+                    if (loadTask.bitmap == null) {
+                        msg.what = Constants.FALSE;
                     } else {
-                        loadTask.bitmap = bitmap;
-                        liv.setState(LoadImageView.LOADED);
-                        msg.what = CONTEXT;
+                        msg.what = Constants.TRUE;
                     }
-                    loadImageHandler.sendMessage(msg);
+                    mHandler.sendMessage(msg);
                 }
             }
         }
     }
+    
+    public interface OnGetImageListener {
+        /**
+         * @return False if you wanna stop get
+         */
+        boolean onGetImage(String key);
+        void onGetImageSuccess(String key, Bitmap bmp);
+        void onGetImageFail(String key);
+    }
 }
diff --git a/src/com/hippo/ehviewer/activity/FavouriteActivity.java b/src/com/hippo/ehviewer/activity/FavouriteActivity.java
index 6d0525c72..5af108664 100644
--- a/src/com/hippo/ehviewer/activity/FavouriteActivity.java
+++ b/src/com/hippo/ehviewer/activity/FavouriteActivity.java
@@ -24,7 +24,7 @@ import android.widget.Toast;
 
 import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.BeautifyScreen;
-import com.hippo.ehviewer.ImageLoadManager;
+import com.hippo.ehviewer.ImageGeterManager;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.data.Data;
 import com.hippo.ehviewer.data.GalleryInfo;
@@ -49,7 +49,7 @@ public class FavouriteActivity extends Activity{
     private List<GalleryInfo> mFavouriteLmd;
     private int longClickItemIndex;
     
-    private ImageLoadManager mImageLoadManager;
+    private ImageGeterManager mImageGeterManager;
     
     private DownloadServiceConnection mServiceConn = new DownloadServiceConnection();
     
@@ -121,7 +121,8 @@ public class FavouriteActivity extends Activity{
             LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.cover);
             if (!String.valueOf(lmd.gid).equals(thumb.getKey())) {
                 thumb.setLoadInfo(lmd.thumb, String.valueOf(lmd.gid));
-                mImageLoadManager.add(thumb, true);
+                mImageGeterManager.add(lmd.thumb, String.valueOf(lmd.gid),
+                        new LoadImageView.SimpleImageGetListener(thumb), true);
 
                 // Set manga name
                 TextView name = (TextView) convertView.findViewById(R.id.name);
@@ -133,8 +134,11 @@ public class FavouriteActivity extends Activity{
                 
                 // Set category
                 TextView category = (TextView) convertView.findViewById(R.id.category);
-                category.setText(Ui.getCategoryText(lmd.category));
-                category.setBackgroundColor(Ui.getCategoryColor(lmd.category));
+                String newText = Ui.getCategoryText(lmd.category);
+                if (!newText.equals(category.getText())) {
+                    category.setText(newText);
+                    category.setBackgroundColor(Ui.getCategoryColor(lmd.category));
+                }
                 
                 // Add star
                 LinearLayout rate = (LinearLayout) convertView
@@ -175,6 +179,7 @@ public class FavouriteActivity extends Activity{
         
         mAppContext = (AppContext)getApplication();
         mData = mAppContext.getData();
+        mImageGeterManager = mAppContext.getImageGeterManager();
         
         int screenOri = Config.getScreenOriMode();
         if (screenOri != getRequestedOrientation())
@@ -186,8 +191,6 @@ public class FavouriteActivity extends Activity{
         
         longClickDialog = setLongClickDialog();
         
-        mImageLoadManager = new ImageLoadManager(getApplicationContext(), Cache.memoryCache, Cache.cpCache);
-        
         getActionBar().setDisplayHomeAsUpEnabled(true);
         
         // For colourfy the activity
diff --git a/src/com/hippo/ehviewer/activity/MangaListActivity.java b/src/com/hippo/ehviewer/activity/MangaListActivity.java
index e647fc722..cb59ed974 100644
--- a/src/com/hippo/ehviewer/activity/MangaListActivity.java
+++ b/src/com/hippo/ehviewer/activity/MangaListActivity.java
@@ -4,7 +4,9 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 
@@ -12,7 +14,7 @@ import uk.co.senab.actionbarpulltorefresh.library.ActionBarPullToRefresh;
 import uk.co.senab.actionbarpulltorefresh.library.listeners.OnRefreshListener;
 
 import com.hippo.ehviewer.AppContext;
-import com.hippo.ehviewer.ImageLoadManager;
+import com.hippo.ehviewer.ImageGeterManager;
 import com.hippo.ehviewer.ListUrls;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.UpdateHelper;
@@ -53,8 +55,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -79,6 +83,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.SearchView;
+import android.widget.SimpleAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -121,11 +126,14 @@ public class MangaListActivity extends SlidingActivity {
     
     private AppContext mAppContext;
     private EhClient mEhClient;
+    private Resources mResources;
+    private ImageGeterManager mImageGeterManager;
     
     private SlidingMenu mSlidingMenu;
     
     private ListView itemListMenu;
     private TagListView tagListMenu;
+    private View mDivider;
     private RelativeLayout loginMenu;
     private ListView isExhentaiList;
     private HfListView mHlv;
@@ -147,11 +155,11 @@ public class MangaListActivity extends SlidingActivity {
 
     private ListUrls lus;
     private GmlAdapter gmlAdapter;
-    private ArrayList<String> listMenuTitle = new ArrayList<String>();
+    private ArrayList<String> listMenuTag = new ArrayList<String>();
     
     private ArrayList<GalleryInfo> lmdArray = new ArrayList<GalleryInfo>();
     
-    private ImageLoadManager mImageLoadManager;
+    
     
     private Data mData;
     
@@ -168,8 +176,6 @@ public class MangaListActivity extends SlidingActivity {
     private long curBackTime = 0;
     private static final int BACK_PRESSED_INTERVAL = 2000;
     
-    private long lastGetStamp;
-    
     //
     private int firstPage = 0;
     private int lastPage = 0;
@@ -291,7 +297,7 @@ public class MangaListActivity extends SlidingActivity {
                             public void onSetVaildName(String newName) {
                                 ((AlertButton)v).dialog.dismiss();
                                 mData.addTag(new Tag(newName, getLus(filterDialog)));
-                                listMenuTitle.add(newName);
+                                listMenuTag.add(newName);
                                 tagsAdapter.addId(newName);
                                 tagsAdapter.notifyDataSetChanged();
                             }
@@ -533,7 +539,7 @@ public class MangaListActivity extends SlidingActivity {
                             Toast.makeText(MangaListActivity.this,
                                     getString(R.string.tag_name_empty),
                                     Toast.LENGTH_SHORT).show();
-                        else if (listMenuTitle.contains(key) && !key.equals(oldStr))
+                        else if (listMenuTag.contains(key) && !key.equals(oldStr))
                             Toast.makeText(MangaListActivity.this,
                                     getString(R.string.tag_name_exist),
                                     Toast.LENGTH_SHORT).show();
@@ -573,7 +579,7 @@ public class MangaListActivity extends SlidingActivity {
         if (cb.isChecked())
             advance.setVisibility(View.VISIBLE);
         
-        return new DialogBuilder(this).setTitle(listMenuTitle.get(position))
+        return new DialogBuilder(this).setTitle(listMenuTag.get(position))
                 .setView(view, false)
                 .setPositiveButton(android.R.string.ok, new View.OnClickListener() {
                     @Override
@@ -581,14 +587,14 @@ public class MangaListActivity extends SlidingActivity {
                         ((AlertButton)v).dialog.dismiss();
                         ListUrls listUrls = getLus(view);
                         if (newTagName != null) {
-                            tagsAdapter.set(listMenuTitle.get(position), newTagName);
                             mData.setTag(position, new Tag(newTagName, listUrls));
-                            listMenuTitle.set(position, newTagName);
+                            tagsAdapter.set(listMenuTag.get(position), newTagName);
+                            listMenuTag.set(position, newTagName);
                             tagsAdapter.notifyDataSetChanged();
                             
                             newTagName = null;
                         } else
-                            mData.setTag(position, new Tag(listMenuTitle.get(position), listUrls));
+                            mData.setTag(position, new Tag(listMenuTag.get(position), listUrls));
                     }
                 }).setNegativeButton(android.R.string.cancel, new View.OnClickListener() {
                     @Override
@@ -599,13 +605,13 @@ public class MangaListActivity extends SlidingActivity {
                 }).setNeutralButton(R.string.tag_change_name, new View.OnClickListener() {
                     @Override
                     public void onClick(final View v) {
-                        String hint = newTagName == null ? listMenuTitle.get(position) : newTagName;
-                        createSetNameDialog(hint, listMenuTitle.get(position), new OnSetNameListener(){
+                        String hint = newTagName == null ? listMenuTag.get(position) : newTagName;
+                        createSetNameDialog(hint, listMenuTag.get(position), new OnSetNameListener(){
                             @Override
                             public void onSetVaildName(String newName) {
-                                if (newName.equals(listMenuTitle.get(position))) // If new is old name
+                                if (newName.equals(listMenuTag.get(position))) // If new is old name
                                     SuperDialogUtil.setTitle(((AlertButton)v).dialog,
-                                            listMenuTitle.get(position));
+                                            listMenuTag.get(position));
                                 else {
                                     newTagName = newName;
                                     SuperDialogUtil.setTitle(((AlertButton)v).dialog,
@@ -780,14 +786,20 @@ public class MangaListActivity extends SlidingActivity {
                 mHlv.setVisibility(View.GONE);
                 noFoundView.setVisibility(View.VISIBLE);
                 sadpanda.setVisibility(View.GONE);
-                setTitle(R.string.no_found);
+                
+                mTitle = mResources.getString(R.string.no_found);
+                setTitle();
+                
                 lmdArray.clear();
                 gmlAdapter.notifyDataSetChanged();
             } else if (maxPage == -1) { //panda
                 mHlv.setVisibility(View.GONE);
                 noFoundView.setVisibility(View.GONE);
                 sadpanda.setVisibility(View.VISIBLE);
-                setTitle(R.string.sadpanda);
+                
+                mTitle = mResources.getString(R.string.sadpanda);
+                setTitle();
+                
                 lmdArray.clear();
                 gmlAdapter.notifyDataSetChanged();
             } else {
@@ -814,7 +826,7 @@ public class MangaListActivity extends SlidingActivity {
                     visiblePage = 0;
                     
                     // set title
-                    setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                    setTitle();
                     
                     // set main list positon
                     setMainListPosition(0);
@@ -831,7 +843,7 @@ public class MangaListActivity extends SlidingActivity {
                         visiblePage = lus.getPage();
                         
                         setMainListPosition(0);
-                        setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                        setTitle();
                     } else {
                         firstIndex += newLmdArray.size();
                         lastIndex += newLmdArray.size();
@@ -852,7 +864,7 @@ public class MangaListActivity extends SlidingActivity {
                         visiblePage = lus.getPage();
                         
                         setMainListPosition(firstIndex);
-                        setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                        setTitle();
                     }
                     break;
                 case SOMEWHERE:
@@ -868,7 +880,7 @@ public class MangaListActivity extends SlidingActivity {
                     visiblePage = lus.getPage();
                     
                     setMainListPosition(0);
-                    setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                    setTitle();
                     break;
                 default:
                     break;
@@ -934,7 +946,7 @@ public class MangaListActivity extends SlidingActivity {
                 visiblePage = visiblePage + pageChanged;
                 firstIndex += pageChanged * lus.getNumPerPage();
                 lastIndex += pageChanged * lus.getNumPerPage();
-                setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                setTitle();
             }
         }
 
@@ -967,24 +979,15 @@ public class MangaListActivity extends SlidingActivity {
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             GalleryInfo lmd= lmdArray.get(position);
-            boolean isNew = false;
             if (convertView == null) {
-                isNew = true;
                 convertView = mInflater.inflate(R.layout.list_item, null);
             }
-            LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.cover);
+            final LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.cover);
             if (!String.valueOf(lmd.gid).equals(thumb.getKey())) {
-                if (!isNew) {
-                    // TODO default index = 0, should get it id
-                    ((ViewGroup)convertView).removeView(thumb);
-                    ViewGroup.LayoutParams lp = thumb.getLayoutParams();
-                    thumb = new LoadImageView(MangaListActivity.this);
-                    thumb.setId(R.id.cover);
-                    ((ViewGroup)convertView).addView(thumb, 0, lp);
-                }
+                
                 thumb.setLoadInfo(lmd.thumb, String.valueOf(lmd.gid));
-                //mImageLoadManager.add(thumb, false);
-                mImageLoadManager.add(thumb, true);
+                mImageGeterManager.add(lmd.thumb, String.valueOf(lmd.gid),
+                        new LoadImageView.SimpleImageGetListener(thumb), true);
                 
                 // Set manga name
                 TextView name = (TextView) convertView.findViewById(R.id.name);
@@ -996,8 +999,11 @@ public class MangaListActivity extends SlidingActivity {
                 
                 // Set category
                 TextView category = (TextView) convertView.findViewById(R.id.category);
-                category.setText(Ui.getCategoryText(lmd.category));
-                category.setBackgroundColor(Ui.getCategoryColor(lmd.category));
+                String newText = Ui.getCategoryText(lmd.category);
+                if (!newText.equals(category.getText())) {
+                    category.setText(newText);
+                    category.setBackgroundColor(Ui.getCategoryColor(lmd.category));
+                }
                 
                 // Add star
                 LinearLayout rate = (LinearLayout) convertView
@@ -1015,6 +1021,8 @@ public class MangaListActivity extends SlidingActivity {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        mSlidingMenu.setBehindWidth(
+                mResources.getDimensionPixelOffset(R.dimen.menu_offset));
     }
     
     @Override
@@ -1031,38 +1039,35 @@ public class MangaListActivity extends SlidingActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.list);
         
+        mAppContext = (AppContext)getApplication();
+        mData = mAppContext.getData();
+        mEhClient = mAppContext.getEhClient();
+        mImageGeterManager = mAppContext.getImageGeterManager();
+        mResources =getResources();
+        
         setBehindContentView(R.layout.list_menu_list);
         setSlidingActionBarEnabled(false);
         mSlidingMenu = getSlidingMenu();
-        mSlidingMenu.setMode(SlidingMenu.LEFT_RIGHT);
+        mSlidingMenu.setMode(SlidingMenu.LEFT);
         mSlidingMenu.setTouchModeAbove(SlidingMenu.TOUCHMODE_FULLSCREEN);
-        mSlidingMenu.setSecondaryMenu(R.layout.list_menu_login);
-        
-        mSlidingMenu.setBehindWidth(Ui.dp2pix(240));
+        mSlidingMenu.setBehindWidth(
+                mResources.getDimensionPixelOffset(R.dimen.menu_offset));
         mSlidingMenu.setShadowDrawable(R.drawable.shadow);
         mSlidingMenu.setShadowWidthRes(R.dimen.shadow_width);
-        
-        //mSlidingMenu.setSecondaryShadowDrawable(R.drawable.shadow_right);
         mSlidingMenu.setOnOpenedListener(new SlidingMenu.OnOpenedListener() {
             @Override
             public void onOpened() {
                 setTitle(R.string.app_name);
-                invalidateOptionsMenu();
             }
         });
-        
         mSlidingMenu.setOnClosedListener(new SlidingMenu.OnClosedListener() {
             @Override
             public void onClosed() {
-                setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+                setTitle();
                 invalidateOptionsMenu();
             }
         });
         
-        mAppContext = (AppContext)getApplication();
-        mData = mAppContext.getData();
-        mEhClient = mAppContext.getEhClient();
-        
         int screenOri = Config.getScreenOriMode();
         if (screenOri != getRequestedOrientation())
             setRequestedOrientation(screenOri);
@@ -1086,13 +1091,11 @@ public class MangaListActivity extends SlidingActivity {
         filterDialog = createFilterDialog();
         longClickDialog = createLongClickDialog();
         
-        //
-        mImageLoadManager = new ImageLoadManager(getApplicationContext(), Cache.memoryCache, Cache.cpCache);
-        
         
         // Get View
         itemListMenu = (ListView) findViewById(R.id.list_menu_item_list);
         tagListMenu = (TagListView) findViewById(R.id.list_menu_tag_list);
+        mDivider = (View)findViewById(R.id.divider);
         loginMenu = (RelativeLayout)findViewById(R.id.list_menu_login);
         isExhentaiList = (ListView)findViewById(R.id.is_exhentai);
         mHlv = (HfListView)findViewById(R.id.list_list);
@@ -1115,8 +1118,39 @@ public class MangaListActivity extends SlidingActivity {
         getActionBar().setHomeButtonEnabled(true);
         
         // leftDrawer
-        String[] menuTitles = getResources().getStringArray(R.array.list_list_title);
-        itemListMenu.setAdapter(new ArrayAdapter<String>(this, R.layout.menu_item, menuTitles));
+        final int[] data = {R.drawable.ic_action_home, R.string.homepage,
+                R.drawable.ic_action_search, android.R.string.search_go,
+                R.drawable.ic_action_favorite, R.string.favourite,
+                R.drawable.ic_action_download, R.string.download};
+        
+        itemListMenu.setAdapter(new BaseAdapter() {
+            @Override
+            public int getCount() {
+                return data.length/2;
+            }
+
+            @Override
+            public Object getItem(int position) {
+                return new int[]{data[position * 2], data[position * 2 + 1]};
+            }
+
+            @Override
+            public long getItemId(int position) {
+                return position;
+            }
+
+            @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+                LayoutInflater li= LayoutInflater.from(MangaListActivity.this);
+                Drawable d = mResources.getDrawable(data[position * 2]);
+                d.setBounds(0, 0, Ui.dp2pix(36), Ui.dp2pix(36));
+                TextView tv = (TextView)li.inflate(R.layout.menu_item, null);
+                tv.setCompoundDrawables(d, null, null, null);
+                tv.setCompoundDrawablePadding(Ui.dp2pix(8));
+                tv.setText(data[position * 2 + 1]);
+                return tv;
+            }
+        });
         itemListMenu.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view,
@@ -1127,7 +1161,7 @@ public class MangaListActivity extends SlidingActivity {
                     ListUrls backup = lus;
                     lus = new ListUrls(ListUrls.ALL_TYPE, null, 0);
                     if (lus != null && refresh()) {
-                        mTitle = listMenuTitle.get(position);
+                        mTitle = mResources.getString(R.string.homepage);
                         setTitle(mTitle);
                         
                         showContent();
@@ -1136,17 +1170,17 @@ public class MangaListActivity extends SlidingActivity {
                     }
                     break;
                     
-                case 1: // Favourite
+                case 1:
+                    filterDialog.show();
+                    break;
+                    
+                case 2: // Favourite
                     intent = new Intent(MangaListActivity.this,
                             FavouriteActivity.class);
                     startActivity(intent);
                     showContent();
                     break;
                     
-                case 2:
-                    filterDialog.show();
-                    break;
-                    
                 case 3:
                     intent = new Intent(MangaListActivity.this,
                             DownloadActivity.class);
@@ -1161,9 +1195,21 @@ public class MangaListActivity extends SlidingActivity {
         List<String> keys = mData.getAllTagNames();
         
         for (int i = 0; i < keys.size(); i++)
-            listMenuTitle.add(keys.get(i));
-        tagsAdapter = new TagsAdapter(this, R.layout.menu_item, listMenuTitle);
-        
+            listMenuTag.add(keys.get(i));
+        tagsAdapter = new TagsAdapter(this, R.layout.menu_tag, listMenuTag);
+        tagsAdapter.setOnDataSetChangedListener(new TagsAdapter.OnDataSetChangedListener() {
+            @Override
+            public void OnDataSetChanged() {
+                if (mData.getAllTags().size() == 0)
+                    mDivider.setVisibility(View.GONE);
+                else
+                    mDivider.setVisibility(View.VISIBLE);
+            }
+        });
+        if (mData.getAllTags().size() == 0)
+            mDivider.setVisibility(View.GONE);
+        else
+            mDivider.setVisibility(View.VISIBLE);
         tagListMenu.setClipToPadding(false);
         tagListMenu.setAdapter(tagsAdapter);
         tagListMenu.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
@@ -1174,7 +1220,7 @@ public class MangaListActivity extends SlidingActivity {
                 ListUrls backup = lus;
                 lus = mData.getTag(position);
                 if (lus != null && refresh()) {
-                    mTitle = listMenuTitle.get(position);
+                    mTitle = listMenuTag.get(position);
                     setTitle(mTitle);
                     showContent();
                 } else {
@@ -1191,22 +1237,20 @@ public class MangaListActivity extends SlidingActivity {
         tagListMenu.setOnSwapListener(new TagListView.OnSwapListener() {
             @Override
             public void onSwap(int positionOne, int positionTwo) {
-                String temp = listMenuTitle.get(positionOne);
-                listMenuTitle.set(positionOne, listMenuTitle.get(positionTwo));
-                listMenuTitle.set(positionTwo, temp);
-                tagsAdapter.notifyDataSetChanged();
-                
+                String temp = listMenuTag.get(positionOne);
                 mData.swapTag(positionOne, positionTwo);
+                listMenuTag.set(positionOne, listMenuTag.get(positionTwo));
+                listMenuTag.set(positionTwo, temp);
+                tagsAdapter.notifyDataSetChanged();
             }
         });
         tagListMenu.setOnDeleteListener(new TagListView.OnDeleteListener() {
             @Override
             public void onDelete(int position) {
-                String removeItem = listMenuTitle.remove(position);
+                String removeItem = listMenuTag.remove(position);
+                mData.deleteTag(position);
                 tagsAdapter.remove(removeItem);
                 tagsAdapter.notifyDataSetChanged();
-                
-                mData.deleteTag(position);
             }
         });
         
@@ -1366,8 +1410,8 @@ public class MangaListActivity extends SlidingActivity {
         checkLogin(false);
         
         // get MangeList
-        mTitle = listMenuTitle.get(0);
-        setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+        mTitle = mResources.getString(R.string.homepage);
+        setTitle();
         refresh(false);
     }
     
@@ -1432,19 +1476,6 @@ public class MangaListActivity extends SlidingActivity {
         return true;
     }
     
-    /*
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // If the nav drawer is open, hide action items related to the content view
-        boolean drawerOpen = mSlidingMenu.isMenuShowing();
-        menu.findItem(R.id.action_search).setVisible(!drawerOpen);
-        menu.findItem(R.id.action_refresh).setVisible(!drawerOpen);
-        menu.findItem(R.id.action_jump).setVisible(!drawerOpen);
-        menu.findItem(R.id.action_settings).setVisible(!drawerOpen);
-        return super.onPrepareOptionsMenu(menu);
-    }
-    */
-    
     // Double click back exit
     @Override
     public void onBackPressed() {
@@ -1464,14 +1495,10 @@ public class MangaListActivity extends SlidingActivity {
         // Handle item selection
         switch (item.getItemId()) {
         case android.R.id.home:
-         // TODO
-            // if (mSlidingMenu.isMenuShowing())
-             // TODO
-                //showContent();
-             // TODO
-                // else
-             // TODO
-                //showMenu();
+            if (mSlidingMenu.isMenuShowing())
+                showContent();
+            else
+                showMenu();
             return true;
         case R.id.action_refresh: // TODO 点击刷新，pullviewheader 不会自动出来
             refresh();
@@ -1495,7 +1522,10 @@ public class MangaListActivity extends SlidingActivity {
     }
     
     public void setTitle() {
-        setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+        if (isGetOk())
+            setTitle(String.format(getString(R.string.list_title), mTitle, visiblePage + 1));
+        else
+            setTitle(mTitle);
     }
     
     @Override
diff --git a/src/com/hippo/ehviewer/view/TagsAdapter.java b/src/com/hippo/ehviewer/view/TagsAdapter.java
index 427b72159..04e1b3213 100644
--- a/src/com/hippo/ehviewer/view/TagsAdapter.java
+++ b/src/com/hippo/ehviewer/view/TagsAdapter.java
@@ -28,7 +28,9 @@ public class TagsAdapter extends ArrayAdapter<String> {
     int lastId = -1;
 
     HashMap<String, Integer> mIdMap = new HashMap<String, Integer>();
-
+    
+    private OnDataSetChangedListener mListener;
+    
     public TagsAdapter(Context context, int textViewResourceId, List<String> objects) {
         super(context, textViewResourceId, objects);
         for (int i = 0; i < objects.size(); ++i) {
@@ -63,4 +65,19 @@ public class TagsAdapter extends ArrayAdapter<String> {
     public void addId(String item) {
         mIdMap.put(item, ++lastId);
     }
+    
+    @Override
+    public void notifyDataSetChanged() {
+        super.notifyDataSetChanged();
+        if (mListener != null)
+            mListener.OnDataSetChanged();
+    }
+    
+    public void setOnDataSetChangedListener(OnDataSetChangedListener l) {
+        mListener = l;
+    }
+    
+    public interface OnDataSetChangedListener {
+        public void OnDataSetChanged();
+    }
 }
diff --git a/src/com/hippo/ehviewer/widget/LoadImageView.java b/src/com/hippo/ehviewer/widget/LoadImageView.java
index aba230fdd..d5d27413d 100644
--- a/src/com/hippo/ehviewer/widget/LoadImageView.java
+++ b/src/com/hippo/ehviewer/widget/LoadImageView.java
@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.widget;
 
-import com.hippo.ehviewer.ImageLoadManager;
+import com.hippo.ehviewer.ImageGeterManager;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.util.Ui;
 
@@ -35,6 +35,8 @@ public class LoadImageView extends ImageView {
     private String mUrl;
     private String mKey;
     
+    private static ImageGeterManager mImageGeterManager;
+    
     public LoadImageView(Context context) {
         super(context);
     }
@@ -56,8 +58,16 @@ public class LoadImageView extends ImageView {
             setClickable(false);
     }
     
-    public void setOnClickListener(ImageLoadManager ilm) {
-        setOnClickListener(new OnClickListener(ilm));
+    public void setOnClick() {
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setClickable(false);
+                setImageDrawable(null);
+                mImageGeterManager.add(mUrl, mKey,
+                        new SimpleImageGetListener(LoadImageView.this), true);
+            }
+        });
     }
     
     public String getUrl() {
@@ -105,16 +115,36 @@ public class LoadImageView extends ImageView {
         }
     }
     
-    class OnClickListener implements View.OnClickListener {
-        private ImageLoadManager mImageLoadManager;
-        public OnClickListener(ImageLoadManager imageLoadManager) {
-            mImageLoadManager = imageLoadManager;
+    public static void setImageGeterManager(ImageGeterManager i) {
+        mImageGeterManager = i;
+    }
+    
+    public static class SimpleImageGetListener
+            implements ImageGeterManager.OnGetImageListener {
+        
+        private LoadImageView mLiv;
+        
+        public SimpleImageGetListener(LoadImageView liv) {
+            mLiv = liv;
         }
         
         @Override
-        public void onClick(View v) {
-            setImageDrawable(null);
-            mImageLoadManager.add(LoadImageView.this, true);
+        public boolean onGetImage(String key) {
+            return key.equals(mLiv.getKey());
+        }
+        @Override
+        public void onGetImageFail(String key) {
+            if (key.equals(mLiv.getKey())) {
+                mLiv.setTouchImage();
+                mLiv.setOnClick();
+            }
+        }
+        @Override
+        public void onGetImageSuccess(String key, Bitmap bmp) {
+            if (key.equals(mLiv.getKey())) {
+                mLiv.setImageDrawable(null);
+                mLiv.setContextImage(bmp);
+            }
         }
     }
 }