diff --git a/src/language.cpp b/src/language.cpp
index dd0560a..6499b73 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -8,9 +8,14 @@
 
 static const QStringList supportList = {"en_US", "en_AU", "en_CA", "en_NZ", "en_GB",
                                         "es_MX", "ja", "ko", "pl", "pt_BR", "ru", "de", "it", 
-                                        "zh_CN", "zh_HK"
+                                        "zh_CN", "zh_HK", "zh_TW"
                                        };
 
+static const QMap<QString, QString> s_displayName = {   {"zh_CN", "简体中文"},
+                                                        {"zh_HK", "繁體中文(香港)"},
+                                                        {"zh_TW", "正體中文"}
+                                                  };
+
 Language::Language(QObject *parent)
     : QObject(parent)
     , m_interface("org.cutefish.Settings",
@@ -28,7 +33,8 @@ Language::Language(QObject *parent)
         locale.getDisplayName(locale, unicodeString);
         unicodeString.toUTF8String(string);
 
-        QString displayName = string.c_str();
+        QString displayName = s_displayName.contains(code) ? s_displayName.value(code)
+                                                           : string.c_str();
 
         if (displayName.isEmpty() || displayName == "C")
             continue;
diff --git a/src/qml/LanguagePage.qml b/src/qml/LanguagePage.qml
index f933732..db19952 100644
--- a/src/qml/LanguagePage.qml
+++ b/src/qml/LanguagePage.qml
@@ -39,8 +39,6 @@ ItemPage {
         ListView {
             id: listView
 
-            boundsBehavior: Flickable.StopAtBounds
-
             FishUI.WheelHandler {
                 target: listView
             }
@@ -54,6 +52,7 @@ ItemPage {
             topMargin: FishUI.Units.largeSpacing
             leftMargin: FishUI.Units.largeSpacing * 2
             rightMargin: FishUI.Units.largeSpacing * 2
+            bottomMargin: FishUI.Units.largeSpacing
             spacing: FishUI.Units.largeSpacing
 
             currentIndex: language.currentLanguage