diff --git a/res/layout/alert_dialog_progress.xml b/res/layout/alert_dialog_progress.xml
index afd5b2ece..0a6fab9f3 100644
--- a/res/layout/alert_dialog_progress.xml
+++ b/res/layout/alert_dialog_progress.xml
@@ -34,7 +34,7 @@
         android:id="@+id/progress_percent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_below="@id/progress"
         android:layout_marginEnd="16dip"
         android:layout_marginStart="16dip"
@@ -44,7 +44,7 @@
         android:id="@+id/progress_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_below="@id/progress"
         android:layout_marginEnd="16dip"
         android:layout_marginStart="16dip"
diff --git a/res/layout/buttons_dialog.xml b/res/layout/buttons_dialog.xml
deleted file mode 100644
index 611e66acf..000000000
--- a/res/layout/buttons_dialog.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 Hippo Seven
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/title_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="64dp"
-        android:background="@android:color/holo_blue_dark"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="24dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="@android:color/white"
-            android:visibility="gone" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/button_root"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/progress_dialog.xml b/res/layout/progress_dialog.xml
index 6aad9eaee..1b4051ec9 100644
--- a/res/layout/progress_dialog.xml
+++ b/res/layout/progress_dialog.xml
@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:max="10000"
-            android:layout_marginEnd="16dip" />
+            android:layout_marginLeft="16dip" />
 
         <TextView android:id="@+id/message"
             android:layout_width="match_parent"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f204e1f09..170b4d74c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,7 +53,7 @@
     <string name="show_expunged">显示被遗弃的资源</string>
 
     <!-- Jump -->
-    <string name="jump_summary" formatted="false">第 %d 页，共 %s 页</string>
+    <string name="jump_summary">第 %1$d 页，共 %2$s 页</string>
     <string name="jump_to">跳至：</string>
     <string name="toast_invalid_page">非法页面</string>
 
@@ -77,7 +77,7 @@
     <string name="image_not_readable">图像不可读</string>
 
     <!-- Update -->
-    <string name="update_message" formatted="false">发现新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
+    <string name="update_message">发现新版本：%1$s\n大小：%2$s\n%3$s\n\n是否更新？</string>
     <string name="checking_update">正在检查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">发现新版本</string>
@@ -103,8 +103,8 @@
     <string name="download_2">下载成功 %d 项</string>
     <string name="download_3">下载失败 %d</string>
     <string name="download_4">下载失败 %d 项</string>
-    <string name="download_5" formatted="false">下载成功 %d, 下载失败 %d</string>
-    <string name="download_6" formatted="false">下载成功 %d 项, 下载失败 %d 项</string>
+    <string name="download_5">下载成功 %1$d, 下载失败 %2$d</string>
+    <string name="download_6">下载成功 %1$d 项, 下载失败 %2$d 项</string>
     <string name="delete_item">该下载项将被删除</string>
 
     <!-- ErrorMessage -->
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 80117db4d..b3a78bb36 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -41,7 +41,7 @@
     <string name="show_expunged">顯示被遺棄的資源</string>
 
     <!-- Jump -->
-    <string name="jump_summary" formatted="false">第 %d 頁，共 %s 頁</string>
+    <string name="jump_summary">第 %1$d 頁，共 %2$s 頁</string>
     <string name="jump_to">跳至：</string>
     <string name="toast_invalid_page">非法頁面</string>
 
@@ -65,7 +65,7 @@
     <string name="image_not_readable">圖像不可讀</string>
 
     <!-- Update -->
-    <string name="update_message" formatted="false">發現新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
+    <string name="update_message">發現新版本：%1$s\n大小：%2$s\n%3$s\n\n是否更新？</string>
     <string name="checking_update">正在檢查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">發現新版本</string>
@@ -91,8 +91,8 @@
     <string name="download_2">下載成功 %d 項</string>
     <string name="download_3">下載失敗 %d</string>
     <string name="download_4">下載失敗 %d 項</string>
-    <string name="download_5" formatted="false">下載成功 %d, 下載失敗 %d</string>
-    <string name="download_6" formatted="false">下載成功 %d 項, 下載失敗 %d 項</string>
+    <string name="download_5">下載成功 %1$d, 下載失敗 %2$d</string>
+    <string name="download_6">下載成功 %1$d 項, 下載失敗 %2$d 項</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">網絡錯誤</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2dcae9391..dfe75d3da 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -41,7 +41,7 @@
     <string name="show_expunged">顯示被遺棄的資源</string>
 
     <!-- Jump -->
-    <string name="jump_summary" formatted="false">第 %d 頁，共 %s 頁</string>
+    <string name="jump_summary">第 %1$d 頁，共 %2$s 頁</string>
     <string name="jump_to">跳至：</string>
     <string name="toast_invalid_page">非法頁面</string>
 
@@ -65,7 +65,7 @@
     <string name="image_not_readable">影象不可讀</string>
 
     <!-- Update -->
-    <string name="update_message" formatted="false">發現新版本：%s\n大小：%s\n%s\n\n是否更新？</string>
+    <string name="update_message">發現新版本：%1$s\n大小：%2$s\n%3$s\n\n是否更新？</string>
     <string name="checking_update">正在檢查更新</string>
     <string name="up_to_date">已是最新版</string>
     <string name="found_update">發現新版本</string>
@@ -91,8 +91,8 @@
     <string name="download_2">下載成功 %d 項</string>
     <string name="download_3">下載失敗 %d</string>
     <string name="download_4">下載失敗 %d 項</string>
-    <string name="download_5" formatted="false">下載成功 %d, 下載失敗 %d</string>
-    <string name="download_6" formatted="false">下載成功 %d 項, 下載失敗 %d 項</string>
+    <string name="download_5">下載成功 %1$d, 下載失敗 %2$d</string>
+    <string name="download_6">下載成功 %1$d 項, 下載失敗 %2$d 項</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">網路錯誤</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 99b9cf9a1..391e7af42 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,7 +56,7 @@
     <string name="show_expunged">Show expunged</string>
 
     <!-- Jump -->
-    <string name="jump_summary" formatted="false">Page %d, %s pages in total</string>
+    <string name="jump_summary">Page %1$d, %2$s pages in total</string>
     <string name="jump_to">Jump to : </string>
     <string name="toast_invalid_page">Invalid page</string>
 
@@ -80,7 +80,7 @@
     <string name="image_not_readable">Image is not readable</string>
 
     <!-- Update -->
-    <string name="update_message" formatted="false">Found new version : %s\nSize : %s\n%s\n\nUpdate ?</string>
+    <string name="update_message">Found new version : %1$s\nSize : %2$s\n%3$s\n\nUpdate ?</string>
     <string name="checking_update">checking updating</string>
     <string name="up_to_date">Up to date</string>
     <string name="found_update">Found update</string>
@@ -106,8 +106,8 @@
     <string name="download_2">Download OK %d items</string>
     <string name="download_3">Download failed %d</string>
     <string name="download_4">Download failed %d items</string>
-    <string name="download_5" formatted="false">Download OK %d, Download failed %d</string>
-    <string name="download_6" formatted="false">Download OK %d items, Download failed %d items</string>
+    <string name="download_5">Download OK %1$d, Download failed %2$d</string>
+    <string name="download_6">Download OK %1$d items, Download failed %2$d items</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">Network Error</string>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index b12ee5116..3e75d0bf1 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -17,37 +17,31 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <header
-        android:id="@+id/display_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$DisplayFragment"
         android:title="@string/display_settings_title"
         android:icon="@drawable/ic_setting_display_dark" />
 
     <header
-        android:id="@+id/eh_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$EhFragment"
         android:title="@string/eh_settings_title"
         android:icon="@drawable/ic_action_panda_dark" />
 
     <header
-        android:id="@+id/read_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$ReadFragment"
         android:title="@string/read_settings_title"
         android:icon="@drawable/ic_setting_read_dark" />
 
     <header
-        android:id="@+id/download_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$DownloadFragment"
         android:title="@string/download_settings_title"
         android:icon="@drawable/ic_setting_download_dark" />
 
     <header
-        android:id="@+id/advanced_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$AdvancedFragment"
         android:title="@string/advanced_settings_title"
         android:icon="@drawable/ic_setting_advanced_dark" />
 
     <header
-        android:id="@+id/about_settings"
         android:fragment="com.hippo.ehviewer.ui.SettingsActivity$AboutFragment"
         android:title="@string/about_settings_title"
         android:icon="@drawable/ic_setting_about_dark" />