diff --git a/bin/EhViewer.apk b/bin/EhViewer.apk
index 82bf5d1c4..8d94db7fa 100644
Binary files a/bin/EhViewer.apk and b/bin/EhViewer.apk differ
diff --git a/bin/R.txt b/bin/R.txt
index 661dc7fa5..9c1ee2b4b 100644
--- a/bin/R.txt
+++ b/bin/R.txt
@@ -202,7 +202,7 @@ int id negative_button 0x7f060036
 int id neutral_button 0x7f060037
 int id page_list 0x7f06002c
 int id pager 0x7f06006b
-int id paper_list_gridLayout 0x7f060072
+int id paper_list_layout 0x7f060072
 int id paper_list_wait 0x7f060073
 int id password 0x7f06006a
 int id positive_button 0x7f060038
diff --git a/bin/classes.dex b/bin/classes.dex
index 2fdc94631..394fbf86b 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/.gitignore b/bin/classes/.gitignore
index 40971e43a..addd239bf 100644
--- a/bin/classes/.gitignore
+++ b/bin/classes/.gitignore
@@ -1,3 +1,2 @@
 /com
 /.gitignore
-/android
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 6036367d0..091c43fda 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/.gitignore b/gen/.gitignore
index 40971e43a..addd239bf 100644
--- a/gen/.gitignore
+++ b/gen/.gitignore
@@ -1,3 +1,2 @@
 /com
 /.gitignore
-/android
diff --git a/project.properties b/project.properties
index 82e986310..4ab125693 100644
--- a/project.properties
+++ b/project.properties
@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=..\\..\\..\\workspace\\gridlayout_v7
diff --git a/res/layout/page_list.xml b/res/layout/page_list.xml
index 92a6063cf..f594ac688 100644
--- a/res/layout/page_list.xml
+++ b/res/layout/page_list.xml
@@ -9,11 +9,12 @@
         layout="@layout/page_list_panel"
         android:layout_gravity="center" />
     
-    <android.support.v7.widget.GridLayout
-        android:id="@+id/paper_list_gridLayout"
+    <com.hippo.ehviewer.widget.AutoWrapLayout
+        android:id="@+id/paper_list_layout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-    </android.support.v7.widget.GridLayout>
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" >
+    </com.hippo.ehviewer.widget.AutoWrapLayout>
     
     <ProgressBar
         android:id="@+id/paper_list_wait"
diff --git a/src/com/hippo/ehviewer/activity/MangaDetailActivity.java b/src/com/hippo/ehviewer/activity/MangaDetailActivity.java
index 4356c9a12..572019dc0 100644
--- a/src/com/hippo/ehviewer/activity/MangaDetailActivity.java
+++ b/src/com/hippo/ehviewer/activity/MangaDetailActivity.java
@@ -17,10 +17,10 @@ import com.hippo.ehviewer.util.Favourite;
 import com.hippo.ehviewer.util.Ui;
 import com.hippo.ehviewer.util.Util;
 import com.hippo.ehviewer.view.OlImageView;
+import com.hippo.ehviewer.widget.AutoWrapLayout;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -29,7 +29,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayout;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -38,17 +37,15 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.AutoCompleteTextView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
-import android.widget.SearchView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -74,7 +71,7 @@ public class MangaDetailActivity extends Activity {
     private ViewGroup mangaDetailOffensive;
     private ViewGroup mangaDetailPining;
     private ViewGroup pageListMain;
-    private GridLayout pageListGridLayout;
+    private AutoWrapLayout pageListLayout;
     private ProgressBar waitPageList;
     private TextView previewNumText;
     private TextView previewNumText2;
@@ -158,13 +155,13 @@ public class MangaDetailActivity extends Activity {
                 white.setBounds(0, 0, item.width, item.height);
                 tvu.setCompoundDrawables(null, white, null, null);
                 
-                GridLayout.LayoutParams lp = new GridLayout.LayoutParams();
+                AutoWrapLayout.LayoutParams lp = new AutoWrapLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
                 lp.leftMargin = Ui.dp2pix(8);
                 lp.topMargin = Ui.dp2pix(8);
                 lp.rightMargin = Ui.dp2pix(8);
                 lp.bottomMargin = Ui.dp2pix(8);
                 
-                pageListGridLayout.addView(tvu, lp);
+                pageListLayout.addView(tvu, lp);
                 index++;
             }
             // Download pic
@@ -172,6 +169,8 @@ public class MangaDetailActivity extends Activity {
                     + curPage + "-" + rowIndex, Util.getResourcesType(row.imageUrl), Cache.memoryCache,
                     Cache.cpCache, new int[]{page, rowIndex}, new PageImageGetListener());
             rowIndex ++;
+            
+            Log.d(TAG, "add page row");
         }
     }
     
@@ -206,7 +205,7 @@ public class MangaDetailActivity extends Activity {
                     item.xOffset, item.yOffset, item.width, item.height));
             bitmapDrawable.setBounds(0, 0, item.width, item.height);
             
-            TextViewWithUrl tvu = (TextViewWithUrl)pageListGridLayout.getChildAt(i);
+            TextViewWithUrl tvu = (TextViewWithUrl)pageListLayout.getChildAt(i);
             tvu.setCompoundDrawables(null, bitmapDrawable, null, null);
         }
         
@@ -370,7 +369,7 @@ public class MangaDetailActivity extends Activity {
     }
     
     private void refreshPageList() {
-        pageListGridLayout.removeAllViews();
+        pageListLayout.removeAllViews();
         waitPageList.setVisibility(View.VISIBLE);
         previewRefreshButton.setVisibility(View.GONE);
         
@@ -483,7 +482,7 @@ public class MangaDetailActivity extends Activity {
         mangaDetailOffensive = (ViewGroup) findViewById(R.id.manga_detail_offensive);
         mangaDetailPining = (ViewGroup) findViewById(R.id.manga_detail_pining);
         pageListMain = (ViewGroup) findViewById(R.id.page_list);
-        pageListGridLayout = (GridLayout) findViewById(R.id.paper_list_gridLayout);
+        pageListLayout = (AutoWrapLayout) findViewById(R.id.paper_list_layout);
         waitPageList = (ProgressBar) findViewById(R.id.paper_list_wait);
         previewRefreshButton = (Button) findViewById(R.id.preview_button_refresh);
         previewNumText = (TextView) findViewById(R.id.preview_num);
@@ -496,7 +495,7 @@ public class MangaDetailActivity extends Activity {
         
         setTitle(mangaDetail.gid);
         
-        calcGridLayout();
+        //calcGridLayout();
         
         OlImageView coverImage = (OlImageView) findViewById(R.id.detail_cover);
         coverImage.setUrl(mangaDetail.thumb);
@@ -576,11 +575,6 @@ public class MangaDetailActivity extends Activity {
             if (mangaDetail.previewLists[0] != null) {
                 pageListMain.setVisibility(View.VISIBLE);
                 // preview num
-                int row = (mangaDetail.previewLists[0].getSum()+columnCount-1)
-                        /columnCount;
-                if (row * (previewHeigth + Ui.dp2pix(32))
-                        < (screenHeight - Ui.getStatusBarHeight()
-                        - Ui.getNavigationBarHeight(false))/2)
                     bottomPanel.setVisibility(View.GONE);
                 
                 previewNumText.setText(String.format("%d / %d",
@@ -597,7 +591,7 @@ public class MangaDetailActivity extends Activity {
         }
     }
     
-    
+    /*
     private void calcGridLayout() {
         // TODO If pre is longer then length, add plane at bottom
         // For pageListGridLayout
@@ -607,7 +601,7 @@ public class MangaDetailActivity extends Activity {
         screenHeight = displaymetrics.heightPixels;
         columnCount = screenWidth / (previewWidth + Ui.dp2pix(16));
         pageListGridLayout.setColumnCount(columnCount);
-    }
+    }*/
     
     
     @Override
diff --git a/src/com/hippo/ehviewer/util/Ui.java b/src/com/hippo/ehviewer/util/Ui.java
index 967edd333..162948465 100644
--- a/src/com/hippo/ehviewer/util/Ui.java
+++ b/src/com/hippo/ehviewer/util/Ui.java
@@ -197,9 +197,6 @@ public class Ui {
      * @return value in pix
      */
     public static int dp2pix(int dp) {
-        if (!mInit) {
-            throw new IllegalStateException("Please init Ui first.");
-        }
         return (int) (mContext.getResources().getDisplayMetrics().density * dp + 0.5f);
     }
     
@@ -209,9 +206,6 @@ public class Ui {
      * @return
      */
     public static BitmapFactory.Options getBitmapOpt() {
-        if (!mInit) {
-            throw new IllegalStateException("Please init Ui first.");
-        }
         return opt;
     }