diff --git a/res/layout/user_panel.xml b/res/layout/user_panel.xml
index 00b9ab6bb..adbb8261b 100644
--- a/res/layout/user_panel.xml
+++ b/res/layout/user_panel.xml
@@ -15,6 +15,7 @@
         android:layout_height="fill_parent" >
         
         <TextView
+            android:id="@+id/user"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -24,41 +25,44 @@
             android:textSize="16.0sp"
             android:textColor="@android:color/white" />
         
-        <LinearLayout
-            android:layout_width="fill_parent"
+        <Button
+            android:id="@+id/login"
+            style="@style/Button.Small.White"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="8dp"
-            android:orientation="horizontal" >
-            
-            <Button
-                style="@style/Button.Small.White"
-                android:layout_width="0.0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:layout_marginLeft="8.0dp"
-                android:layout_marginRight="8.0dp"
-                android:text="@string/login" />
-            
-            <Button
-                style="@style/Button.Small.White"
-                android:layout_width="0.0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:layout_marginLeft="8.0dp"
-                android:layout_marginRight="8.0dp"
-                android:text="@string/register" />
-            
-            <Button
-                style="@style/Button.Small.White"
-                android:layout_width="0.0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:layout_marginLeft="8.0dp"
-                android:layout_marginRight="8.0dp"
-                android:text="@string/logout" />
-            
-        </LinearLayout>
+            android:layout_marginLeft="8.0dp"
+            android:layout_marginBottom="8.0dp"
+            android:text="@string/login" />
+        
+        <Button
+            android:id="@+id/register"
+            style="@style/Button.Small.White"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/login"
+            android:layout_marginLeft="16.0dp"
+            android:layout_alignBottom="@id/login"
+            android:text="@string/register" />
+        
+        <Button
+            android:id="@+id/logout"
+            style="@style/Button.Small.White"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="8.0dp"
+            android:layout_marginBottom="8.0dp"
+            android:text="@string/logout" />
+        
+        <ProgressBar
+            android:id="@+id/wait"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
         
     </RelativeLayout>
     
diff --git a/src/com/hippo/ehviewer/activity/MangaListActivity.java b/src/com/hippo/ehviewer/activity/MangaListActivity.java
index 8e9abb839..358e23761 100644
--- a/src/com/hippo/ehviewer/activity/MangaListActivity.java
+++ b/src/com/hippo/ehviewer/activity/MangaListActivity.java
@@ -108,7 +108,9 @@ import android.widget.Toast;
  * 
  * @author Hippo
  */
-public class MangaListActivity extends SlidingActivity {
+public class MangaListActivity extends SlidingActivity
+        implements View.OnClickListener {
+    
     private static String TAG = "MangaListActivity";
     
     private static final int REFRESH = 0x0;
@@ -128,21 +130,18 @@ public class MangaListActivity extends SlidingActivity {
     private SearchView mSearchView;
     private ListView itemListMenu;
     private TagListView tagListMenu;
-    private RelativeLayout loginMenu;
     private HfListView mHlv;
     private FswListView mMainList;
     private View waitView;
     private Button freshButton;
     private View noFoundView;
     private ImageView sadpanda;
-    private ViewGroup loginView;
-    private ViewGroup loginOverView;
+    
+    private TextView userView;
     private Button loginButton;
-    private Button checkLoginButton;
-    private View waitloginView;
-    private TextView usernameText;
+    private Button registerButton;
     private Button logoutButton;
-    private View waitlogoutView;
+    private View waitloginoutView;
     
     private TagsAdapter tagsAdapter;
 
@@ -188,6 +187,12 @@ public class MangaListActivity extends SlidingActivity {
     
     private DownloadServiceConnection mServiceConn = new DownloadServiceConnection();
     
+    private void toRegister() {
+        Uri uri = Uri.parse("http://forums.e-hentai.org/index.php?act=Reg");
+        Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+        startActivity(intent);
+    }
+    
     private AlertDialog createLoginDialog() {
         LayoutInflater inflater = this.getLayoutInflater();
         View view = inflater.inflate(R.layout.login, null);
@@ -199,8 +204,7 @@ public class MangaListActivity extends SlidingActivity {
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
-                        loginButton.setVisibility(View.GONE);
-                        waitloginView.setVisibility(View.VISIBLE);
+                        setUserPanel(WAIT);
                         String username = ((EditText) loginDialog.findViewById(R.id.username)).getText().toString();
                         String password = ((EditText) loginDialog.findViewById(R.id.password)).getText().toString();
                         mEhClient.login(username, password, new EhClient.OnLoginListener() {
@@ -210,8 +214,7 @@ public class MangaListActivity extends SlidingActivity {
                             }
                             @Override
                             public void onFailure(String eMsg) {
-                                loginButton.setVisibility(View.VISIBLE);
-                                waitloginView.setVisibility(View.GONE);
+                                setUserPanel();
                                 Toast.makeText(MangaListActivity.this,
                                         eMsg,
                                         Toast.LENGTH_SHORT).show();
@@ -223,14 +226,12 @@ public class MangaListActivity extends SlidingActivity {
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
-                        layoutDrawRight();
+                        setUserPanel();
                     }
                 }).setNeutralButton(R.string.register, new View.OnClickListener(){
                     @Override
                     public void onClick(View v) {
-                        Uri uri = Uri.parse("http://forums.e-hentai.org/index.php?act=Reg");
-                        Intent intent = new Intent(Intent.ACTION_VIEW,uri);
-                        startActivity(intent);
+                        toRegister();
                     } 
                 }).create();
     }
@@ -1054,6 +1055,37 @@ public class MangaListActivity extends SlidingActivity {
         handleIntent(intent); 
     }
     
+    @Override
+    public void onClick(View v) {
+        
+        if (v == loginButton) {
+            loginDialog.show();
+        } else if (v == registerButton) {
+            toRegister();
+        } else if (v == logoutButton) {
+            setUserPanel(WAIT);
+            
+            mEhClient.logout(new EhClient.OnLogoutListener() {
+                @Override
+                public void onSuccess() {
+                    Toast.makeText(MangaListActivity.this,
+                            getString(R.string.toast_logout_succeeded),
+                            Toast.LENGTH_SHORT).show();
+                    Config.logoutNow();
+                    setUserPanel();
+                }
+
+                @Override
+                public void onFailure(String eMsg) {
+                    Toast.makeText(MangaListActivity.this,
+                            eMsg,
+                            Toast.LENGTH_SHORT).show();
+                    setUserPanel();
+                }
+            });
+        }
+    }
+    
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -1119,21 +1151,22 @@ public class MangaListActivity extends SlidingActivity {
         mUserPanel = (LinearLayout)findViewById(R.id.user_panel);
         itemListMenu = (ListView) findViewById(R.id.list_menu_item_list);
         tagListMenu = (TagListView) findViewById(R.id.list_menu_tag_list);
-        loginMenu = (RelativeLayout)findViewById(R.id.list_menu_login);
         mHlv = (HfListView)findViewById(R.id.list_list);
         mMainList = mHlv.getListView();
         waitView = (View) findViewById(R.id.list_wait_first);
         freshButton = (Button) findViewById(R.id.list_refresh);
         noFoundView = (View) findViewById(R.id.list_no_found);
         sadpanda = (ImageView) findViewById(R.id.sadpanda);
-        loginView = (ViewGroup) findViewById(R.id.drawer_login);
-        loginButton = (Button) findViewById(R.id.button_login);
-        checkLoginButton = (Button) findViewById(R.id.button_check_login);
-        waitloginView = (View) findViewById(R.id.list_wait_login);
-        loginOverView = (ViewGroup) findViewById(R.id.drawer_login_over);
-        usernameText = (TextView) findViewById(R.id.text_username);
-        logoutButton = (Button) findViewById(R.id.list_button_logout);
-        waitlogoutView = (View) findViewById(R.id.list_wait_logout);
+        
+        userView = (TextView)mUserPanel.findViewById(R.id.user);
+        loginButton = (Button)mUserPanel.findViewById(R.id.login);
+        registerButton = (Button)mUserPanel.findViewById(R.id.register);
+        logoutButton = (Button)mUserPanel.findViewById(R.id.logout);
+        waitloginoutView = mUserPanel.findViewById(R.id.wait);
+        
+        loginButton.setOnClickListener(this);
+        registerButton.setOnClickListener(this);
+        logoutButton.setOnClickListener(this);
         
         // Drawer
         getActionBar().setDisplayHomeAsUpEnabled(true);
@@ -1346,8 +1379,6 @@ public class MangaListActivity extends SlidingActivity {
             }
         });
         
-        
-        
         FswView alignment = (FswView)findViewById(R.id.alignment);
         alignment.addOnFitSystemWindowsListener(new OnFitSystemWindowsListener() {
             @Override
@@ -1375,8 +1406,7 @@ public class MangaListActivity extends SlidingActivity {
         // Check update
         checkUpdate();
         
-        // Check login
-        layoutDrawRight();
+        // Check login and update user panel
         checkLogin(false);
         
         // get MangeList
@@ -1390,7 +1420,6 @@ public class MangaListActivity extends SlidingActivity {
         freshButton.setVisibility(View.GONE);
         noFoundView.setVisibility(View.GONE);
         sadpanda.setVisibility(View.GONE);
-        layoutDrawRight();
     }
     
     @Override
@@ -1617,12 +1646,10 @@ public class MangaListActivity extends SlidingActivity {
     }
     
     private void checkLogin(boolean force) {
-        /*
         
-        if (Config.isLogin() || force) {
-            loginButton.setVisibility(View.GONE);
-            checkLoginButton.setVisibility(View.GONE);
-            waitloginView.setVisibility(View.VISIBLE);
+        if ((Config.isLogin() || force)
+                && ! mEhClient.isLogin()) {
+            setUserPanel(WAIT);
             mEhClient.checkLogin(new EhClient.OnCheckLoginListener() {
                 @Override
                 public void onSuccess() {
@@ -1630,49 +1657,60 @@ public class MangaListActivity extends SlidingActivity {
                     Toast.makeText(MangaListActivity.this,
                             getString(R.string.toast_login_succeeded),
                             Toast.LENGTH_SHORT).show();
-                    layoutDrawRight();
+                    setUserPanel();
                 }
 
                 @Override
                 public void onFailure(String eMsg) {
-                    loginButton.setVisibility(View.VISIBLE);
-                    if (Config.isLogin())
-                        checkLoginButton.setVisibility(View.VISIBLE);
-                    else
-                        checkLoginButton.setVisibility(View.GONE);
-                    waitloginView.setVisibility(View.GONE);
+                    setUserPanel();
                     Toast.makeText(MangaListActivity.this,
                             eMsg,
                             Toast.LENGTH_SHORT).show();
                 }
             });
+        } else {
+            setUserPanel();
         }
-        */
+        
     }
     
-    private void layoutDrawRight() {
-        /*
+    private static final int LOGIN = 0x0;
+    private static final int LOGOUT = 0x1;
+    private static final int WAIT = 0x2;
+    
+    private void setUserPanel() {
+        if (mEhClient.isLogin())
+            setUserPanel(LOGOUT);
+        else
+            setUserPanel(LOGIN);
+    }
+    
+    private void setUserPanel(int state) {
         
-        if (mEhClient.isLogin()) { // If have login
-            loginView.setVisibility(View.GONE);
-            loginOverView.setVisibility(View.VISIBLE);
-            
-            usernameText.setText(mEhClient.getUsername());
-            logoutButton.setVisibility(View.VISIBLE);
-            waitlogoutView.setVisibility(View.GONE);
-        } else {
-            loginView.setVisibility(View.VISIBLE);
-            loginOverView.setVisibility(View.GONE);
-            
+        switch (state) {
+        case LOGIN:
+            userView.setVisibility(View.GONE);
             loginButton.setVisibility(View.VISIBLE);
-            if (Config.isLogin())
-                checkLoginButton.setVisibility(View.VISIBLE);
-            else
-                checkLoginButton.setVisibility(View.GONE);
-            waitloginView.setVisibility(View.GONE);
+            registerButton.setVisibility(View.VISIBLE);
+            logoutButton.setVisibility(View.GONE);
+            waitloginoutView.setVisibility(View.GONE);
+            break;
+        case LOGOUT:
+            userView.setText(mEhClient.getUsername());
+            userView.setVisibility(View.VISIBLE);
+            loginButton.setVisibility(View.GONE);
+            registerButton.setVisibility(View.GONE);
+            logoutButton.setVisibility(View.VISIBLE);
+            waitloginoutView.setVisibility(View.GONE);
+            break;
+        case WAIT:
+            userView.setVisibility(View.GONE);
+            loginButton.setVisibility(View.GONE);
+            registerButton.setVisibility(View.GONE);
+            logoutButton.setVisibility(View.GONE);
+            waitloginoutView.setVisibility(View.VISIBLE);
+            break;
         }
-        
-        */
     }
     
     private void getList() {
@@ -1704,34 +1742,6 @@ public class MangaListActivity extends SlidingActivity {
         freshButton.setVisibility(View.GONE);
         waitView.setVisibility(View.VISIBLE);
     }
-
-    public void buttonLogout(View paramView) {
-        logoutButton.setVisibility(View.GONE);
-        waitlogoutView.setVisibility(View.VISIBLE);
-        mEhClient.logout(new EhClient.OnLogoutListener() {
-            @Override
-            public void onSuccess() {
-                Toast.makeText(MangaListActivity.this,
-                        getString(R.string.toast_logout_succeeded),
-                        Toast.LENGTH_SHORT).show();
-                Config.logoutNow();
-                layoutDrawRight();
-            }
-
-            @Override
-            public void onFailure(String eMsg) {
-                Toast.makeText(MangaListActivity.this,
-                        eMsg,
-                        Toast.LENGTH_SHORT).show();
-                logoutButton.setVisibility(View.VISIBLE);
-                waitlogoutView.setVisibility(View.GONE);
-            }
-        });
-    }
-    
-    public void buttonLogin(View v) {
-        loginDialog.show();
-    }
     
     public void buttonCheckLogin(View v) {
         checkLogin(false);