diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 174a87c2e..1edef5f75 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -134,27 +134,27 @@ public final class MainActivity extends StageActivity
     public void startSceneForCheckStep(int checkStep, Bundle args) {
         switch (checkStep) {
             case CHECK_STEP_SECURITY:
-                if (true || Settings.getShowWarning()) {
+                if (Settings.getShowWarning()) {
                     startScene(new Announcer(WarningScene.class).setArgs(args));
                     break;
                 }
             case CHECK_STEP_WARNING:
-                if (true || Settings.getAskAnalytics()) {
+                if (Settings.getAskAnalytics()) {
                     startScene(new Announcer(AnalyticsScene.class).setArgs(args));
                     break;
                 }
             case CHECK_STEP_ANALYTICS:
-                if (true || Crash.hasCrashFile()) {
+                if (Crash.hasCrashFile()) {
                     startScene(new Announcer(CrashScene.class).setArgs(args));
                     break;
                 }
             case CHECK_STEP_CRASH:
-                if (true || EhUtils.needSignedIn(this)) {
+                if (EhUtils.needSignedIn(this)) {
                     startScene(new Announcer(SignInScene.class).setArgs(args));
                     break;
                 }
             case CHECK_STEP_SIGN_IN:
-                if (true || Settings.getSelectSite()) {
+                if (Settings.getSelectSite()) {
                     startScene(new Announcer(SelectSiteScene.class).setArgs(args));
                     break;
                 }
@@ -196,7 +196,7 @@ public final class MainActivity extends StageActivity
     protected Announcer getLaunchAnnouncer() {
         if (!TextUtils.isEmpty(Settings.getSecurity())) {
             return new Announcer(SecurityScene.class);
-        } else if (true || Settings.getShowWarning()) {
+        } else if (Settings.getShowWarning()) {
             return new Announcer(WarningScene.class);
         } else if (Settings.getAskAnalytics()) {
             return new Announcer(AnalyticsScene.class);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
index 625622e49..604e6e3d6 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
@@ -35,7 +35,6 @@ import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
-import com.hippo.rippleold.RippleSalon;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.ViewUtils;
 
@@ -80,8 +79,6 @@ public class CookieSignInScene extends BaseScene implements EditText.OnEditorAct
 
         mOk.setOnClickListener(this);
 
-        RippleSalon.addRipple(mOk, true);
-
         return view;
     }
 
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index 1c205ba4a..fd68b1f7a 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -15,105 +15,120 @@
   ~ limitations under the License.
   -->
 
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/login_form"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:padding="@dimen/keyline_margin"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:padding="@dimen/keyline_margin"
+        app:srcCompat="@drawable/v_cookie_brown_x48"/>
+
+    <com.hippo.widget.MaxSizeContainer
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        app:maxWidth="@dimen/single_max_width">
+
+        <ScrollView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/keyline_margin"
+            android:paddingBottom="@dimen/keyline_margin"
+            android:clipToPadding="false">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cookie_explain"
+                    android:textColor="@android:color/black"
+                    android:textSize="@dimen/text_little_small"/>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/ipb_member_id_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/keyline_margin"
+                    android:minWidth="@dimen/single_max_width">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/ipb_member_id"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="ipb_member_id"
+                        android:imeOptions="actionNext"
+                        android:inputType="text"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        tools:ignore="HardcodedText"/>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/ipb_pass_hash_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:minWidth="@dimen/single_max_width">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/ipb_pass_hash"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="ipb_pass_hash"
+                        android:imeOptions="actionDone"
+                        android:inputType="text"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        tools:ignore="HardcodedText"/>
+
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
+        </ScrollView>
+    </com.hippo.widget.MaxSizeContainer>
+
+    <android.support.v7.widget.ButtonBarLayout
+        android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/keyline_margin"
-        android:orientation="vertical">
+        android:orientation="horizontal"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:gravity="bottom"
+        style="?attr/buttonBarStyle">
 
-        <ImageView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="@dimen/keyline_margin"
-            app:srcCompat="@drawable/v_cookie_brown_x48"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/cookie_explain"
-            android:textColor="@android:color/black"
-            android:textSize="@dimen/text_little_small"/>
-
-        <android.support.design.widget.TextInputLayout
-            android:id="@+id/ipb_member_id_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/keyline_margin"
-            android:minWidth="@dimen/single_max_width">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/ipb_member_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="ipb_member_id"
-                android:imeOptions="actionNext"
-                android:inputType="text"
-                android:maxLines="1"
-                android:singleLine="true"/>
-
-        </android.support.design.widget.TextInputLayout>
-
-        <android.support.design.widget.TextInputLayout
-            android:id="@+id/ipb_pass_hash_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:minWidth="@dimen/single_max_width">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/ipb_pass_hash"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="ipb_pass_hash"
-                android:imeOptions="actionDone"
-                android:inputType="text"
-                android:maxLines="1"
-                android:singleLine="true"/>
-
-        </android.support.design.widget.TextInputLayout>
-
-        <android.support.v4.widget.Space
-            android:layout_width="wrap_content"
+        <View
+            android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1"/>
 
-        <android.support.v7.widget.ButtonBarLayout
-            android:id="@+id/buttonPanel"
-            android:layout_width="match_parent"
+        <Button
+            android:id="@+id/ok"
+            style="?attr/buttonBarPositiveButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="12dp"
-            android:paddingRight="12dp"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            android:gravity="bottom"
-            style="?attr/buttonBarStyle">
+            android:layout_weight="1"
+            android:textColor="?attr/colorPrimary"
+            android:textStyle="bold"
+            android:text="@android:string/ok"/>
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
-
-            <Button
-                android:id="@+id/ok"
-                style="?attr/buttonBarPositiveButtonStyle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="?attr/colorPrimary"
-                android:textStyle="bold"
-                android:text="@android:string/ok"/>
-
-        </android.support.v7.widget.ButtonBarLayout>
-    </LinearLayout>
-</ScrollView>
+    </android.support.v7.widget.ButtonBarLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 441029eca..2551c0477 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -39,7 +39,7 @@
 
     <string name="default_display_name">Little Hippo</string>
 
-    <string name="cookie_explain">Cookie 是存储在浏览器里的一小块数据。如果您不清楚 Cookie 什么或者怎么获取 Cookie，最好搜索一下。\n\n可以通过输入特定的 Cookie 来登陆。</string>
+    <string name="cookie_explain">Cookie 是存储在浏览器里的一小块数据。如果您不清楚 Cookie 什么或者怎么获取 Cookie，最好搜索一下。\n\n请输入特定的 Cookie 来登陆。</string>
     <string name="text_is_empty">文本为空</string>
     <string name="waring">警告</string>
     <string name="wrong_cookie_warning">看起来您输入的 Cookie 是错误的，最好检查一下。</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c8d7b09c9..756bb09d9 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -39,7 +39,7 @@
 
     <string name="default_display_name">Little Hippo</string>
 
-    <string name="cookie_explain">Cookie 是存儲在瀏覽器裏的一小塊數據。如果您不清楚 Cookie 什麼或者怎麼獲取 Cookie，最好搜索一下。\n\n可以通過輸入特定的 Cookie 來登陸。</string>
+    <string name="cookie_explain">Cookie 是存儲在瀏覽器裏的一小塊數據。如果您不清楚 Cookie 什麼或者怎麼獲取 Cookie，最好搜索一下。\n\n請輸入特定的 Cookie 來登陸。</string>
     <string name="text_is_empty">文本為空</string>
     <string name="waring">警告</string>
     <string name="wrong_cookie_warning">看起來您輸入的 Cookie 是錯誤的，最好檢查一下。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d0cc35918..2dff958c7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -39,7 +39,7 @@
 
     <string name="default_display_name">Little Hippo</string>
 
-    <string name="cookie_explain">Cookie 是儲存在瀏覽器裡的一小塊資料。如果您不清楚 Cookie 什麼或者怎麼獲取 Cookie，最好搜尋一下。\n\n可以通過輸入特定的 Cookie 來登陸。</string>
+    <string name="cookie_explain">Cookie 是儲存在瀏覽器裡的一小塊資料。如果您不清楚 Cookie 什麼或者怎麼獲取 Cookie，最好搜尋一下。\n\n請輸入特定的 Cookie 來登陸。</string>
     <string name="text_is_empty">文字為空</string>
     <string name="waring">警告</string>
     <string name="wrong_cookie_warning">看起來您輸入的 Cookie 是錯誤的，最好檢查一下。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8928af9e8..09f078300 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
 
     <string name="default_display_name">Little Hippo</string>
 
-    <string name="cookie_explain">A cookie is a small piece of data stored in web browser. Search it if you don\'t know what it is or how to get it.\n\nYou can sign in by entering special cookies.</string>
+    <string name="cookie_explain">A cookie is a small piece of data stored in web browser. Search it if you don\'t know what it is or how to get it.\n\nPlease enter special cookies to sign in.</string>
     <string name="text_is_empty">Text is empty</string>
     <string name="waring">Warning</string>
     <string name="wrong_cookie_warning">It seems that the cookies you entered are wrong. You\'d better check them.</string>