diff --git a/packages/ui-default/components/form/checkbox.page.styl b/packages/ui-default/components/form/checkbox.page.styl
index c7fa74117..5c6b46146 100644
--- a/packages/ui-default/components/form/checkbox.page.styl
+++ b/packages/ui-default/components/form/checkbox.page.styl
@@ -69,7 +69,7 @@ $checkbox-size = 16px
       margin-right: rem(5px)
 
 label.checkbox.inverse
-  color: rgba($immersive-text-color, 0.8)
+  color: rgba($immersive-text-color, 0.8) !important
 
   input
     color: $immersive-text-color
diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml
index f9081d180..74d4e2d45 100644
--- a/packages/ui-default/locales/zh.yaml
+++ b/packages/ui-default/locales/zh.yaml
@@ -74,6 +74,8 @@ All Languages: 所有语言
 All Submissions: 所有递交
 All Training Plans: 所有训练计划
 All: 全部
+Allow to maintain this contest: 允许管理此比赛
+Allow user view others code after contest: 允许用户赛后查看其他人的代码
 Always granted all privileges: 总是拥有所有权限
 An error has occurred.: 发生了一个错误。
 An example of dataset: 测试数据集的一个例子
@@ -83,6 +85,7 @@ API: API
 Argument {0} is invalid.: 非法的参数 {0} 。
 Arguments: 参数
 Assign: 分配给
+Assign User or Group: 分配给用户或小组
 Assignment: 作业
 At least 4 characters: 至少 4 个字符
 Attend Contest: 参加比赛
@@ -90,6 +93,8 @@ Attend contests: 参加比赛
 Attended: 已参加
 author: 作者
 Auto Read Tasks: 自动识别任务
+Auto hide problems during the contest: 在比赛过程中自动隐藏题目
+Basic Info: 基础信息
 Be Copied: 被复制
 Begin at: 开始于
 Begin Date: 开始日期
@@ -167,6 +172,8 @@ contest_edit: 编辑比赛
 contest_main: 比赛
 contest_scoreboard: 比赛成绩表
 Contest: 比赛
+Contest Maintainer: 比赛管理员
+Contest Settings: 比赛设置
 Continue: 继续
 Contributed Problems: 贡献的题目
 Contributions: 贡献
@@ -452,6 +459,7 @@ LaTeX Expressions: LaTeX 表达式
 Learn More: 了解更多
 Leave blank to use numeric pid.: 留空来使用数字题号。
 Light: 亮色
+Limit user in N hours finish contest: 限制用户在N小时内完成比赛
 Limitations: 限制
 Links: 链接
 List View: 列表视图
@@ -460,6 +468,7 @@ Live...: 正在进行…
 Loading editor...: 正在加载编辑器...
 Loading file...: 正在加载文件内容...
 Location: 位置
+Lock scoreboard on last N minutes: 在赛事最后N分钟时锁定成绩表
 Login to Attend Contest: 登录后参加比赛
 Login to Claim Homework: 登录后认领作业
 Login to Create a Discussion: 登录后创建讨论
@@ -508,6 +517,7 @@ Nav Logo Dark: 左上角小图标（暗）
 Nav Logo Dark@2x: 左上角图标（暗）（大）
 Nav Logo Light: 左上角图标（亮）
 Nav Logo Light@2x: 左上角图标（亮）（大）
+Need Invitation Code: 需要邀请码
 Network error: 网络错误
 Never expire: 从不过期
 New dataset: 新测试数据
@@ -583,6 +593,7 @@ perm_problem: 题库
 perm_record: 记录
 perm_training: 训练
 Permission: 权限
+Permission Control: 权限控制
 Permissions: 权限
 Pick a problem randomly based on current filter: 根据当前过滤条件随机选择一道题
 Pin: 置顶
diff --git a/packages/ui-default/templates/contest_edit.html b/packages/ui-default/templates/contest_edit.html
index fa7537e51..9f490a715 100644
--- a/packages/ui-default/templates/contest_edit.html
+++ b/packages/ui-default/templates/contest_edit.html
@@ -5,7 +5,7 @@
     <div class="section">
       <form method="post">
         <div class="section__header">
-          <h2 class="section__title">{{ _('Basic Settings') }}</h2>
+          <h2 class="section__title">{{ _('Basic Info') }}</h2>
         </div>
         <div class="section__body">
           <div class="row">
@@ -80,9 +80,16 @@
           }) }}
         </div>
         <div style="padding-top: 0" class="section__header">
-          <h2 class="section__title">{{ _('Authorize Settings') }}</h2>
+          <h2 class="section__title">{{ _('Permission Control') }}</h2>
         </div>
         <div class="section__body">
+          {{ form.form_text({
+            columns:12,
+            label:'Contest Maintainer',
+            name:'maintainer',
+            help_text:_('Allow to maintain this contest'),
+            value:tdoc.maintainer|default('')
+          }) }}
           <div class="row">
             {{ form.form_select({
               columns:3,
@@ -91,7 +98,7 @@
               options:{
                 'public': _('Public'),
                 'invite': _('Need Invitation Code'),
-                'assign': _('Assign User/Group')
+                'assign': _('Assign User or Group')
               },
               value: ("public" if not tdoc._code else "invite") if not tdoc.assign else "assign",
               disabled:true,
@@ -118,13 +125,6 @@
             }) }}
             </div>
           </div>
-          {{ form.form_text({
-            columns:12,
-            label:'Maintainer',
-            name:'maintainer',
-            help_text:_('Allow to Maintain Contest'),
-            value:tdoc.maintainer|default('')
-          }) }}
         </div>
         <div style="padding-top: 0" class="section__header">
           <h2 class="section__title">{{ _('Contest Settings') }}</h2>
@@ -143,7 +143,7 @@
               columns:3,
               label:'Auto hide-and show',
               name:'autoHide',
-              placeholder:_('Auto hide problems between contest'),
+              placeholder:_('Auto hide problems during the contest'),
               value:handler.user.hasPerm(perm.PERM_EDIT_PROBLEM) and (tdoc.autoHide|default(true)),
               disabled:not handler.user.hasPerm(perm.PERM_EDIT_PROBLEM),
               row:false
@@ -161,6 +161,7 @@
               columns:4,
               label:'Lock (minutes)',
               name:'lock',
+              placeholder:_('(leave blank if none)'),
               value:(((tdoc.endAt - tdoc.lockAt)/60000)|int)|default(''),
               help_text:_('Lock scoreboard on last N minutes'),
               row:false
@@ -171,6 +172,7 @@
               columns:4,
               label:'Flexable Duration',
               name:'contestDuration',
+              placeholder:_('(leave blank if none)'),
               value:tdoc.duration|default(''),
               help_text:_('Limit user in N hours finish contest'),
               row:false
diff --git a/packages/ui-default/templates/partials/login_dialog.html b/packages/ui-default/templates/partials/login_dialog.html
index eb73c585d..202cb4700 100644
--- a/packages/ui-default/templates/partials/login_dialog.html
+++ b/packages/ui-default/templates/partials/login_dialog.html
@@ -35,7 +35,7 @@
         </div></div>
         <div class="row"><div class="columns">
           <label class="checkbox">
-            <input type="checkbox" name="rememberme">{{ _('Remember me') }}
+            <input type="checkbox" name="rememberme" class="checkbox">{{ _('Remember me') }}
           </label>
         </div></div>
         <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
diff --git a/packages/ui-default/templates/user_login.html b/packages/ui-default/templates/user_login.html
index 3e23962b7..1f8495a94 100644
--- a/packages/ui-default/templates/user_login.html
+++ b/packages/ui-default/templates/user_login.html
@@ -24,8 +24,8 @@
         </label>
       </div></div>
       <div class="row"><div class="columns">
-        <label class="inverse material checkbox">
-          <input type="checkbox" name="rememberme">{{ _('Remember me') }}
+        <label class="inverse material checkbox" style="color:#fff;">
+          <input type="checkbox" name="rememberme" class="checkbox">{{ _('Remember me') }}
         </label>
       </div></div>
       <div class="row"><div class="columns">