diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties
index 1c4e9c62..9bb88644 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -113,7 +113,7 @@ jobinfo_field_add=Add Job
 jobinfo_field_update=Edit Job
 jobinfo_field_id=Job ID
 jobinfo_field_jobgroup=Executor
-jobinfo_field_jobdesc=Job description
+jobinfo_field_jobdesc=Job name
 jobinfo_field_timeout=Job timeout period
 jobinfo_field_gluetype=GLUE Type
 jobinfo_field_executorparam=Param
@@ -202,7 +202,7 @@ jobgroup_list=Executor List
 jobgroup_add=Add Executor
 jobgroup_edit=Edit Executor
 jobgroup_del=Delete Executor
-jobgroup_field_title=Title
+jobgroup_field_title=Executor Name
 jobgroup_field_addressType=Registry Type
 jobgroup_field_addressType_0=Automatic registration
 jobgroup_field_addressType_1=Manual registration
diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
index 29b3ec6f..ed88947e 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
@@ -113,7 +113,7 @@ jobinfo_field_add=新增任务
 jobinfo_field_update=更新任务
 jobinfo_field_id=任务ID
 jobinfo_field_jobgroup=执行器
-jobinfo_field_jobdesc=任务描述
+jobinfo_field_jobdesc=任务名称
 jobinfo_field_gluetype=运行模式
 jobinfo_field_executorparam=任务参数
 jobinfo_field_author=负责人
@@ -202,7 +202,7 @@ jobgroup_list=执行器列表
 jobgroup_add=新增执行器
 jobgroup_edit=编辑执行器
 jobgroup_del=删除执行器
-jobgroup_field_title=名称
+jobgroup_field_title=执行器名称
 jobgroup_field_addressType=注册方式
 jobgroup_field_addressType_0=自动注册
 jobgroup_field_addressType_1=手动录入
diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
index f9f7dd8a..8b9ef42d 100755
--- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
@@ -113,7 +113,7 @@ jobinfo_field_add=新增任務
 jobinfo_field_update=更新任務
 jobinfo_field_id=任務ID
 jobinfo_field_jobgroup=執行器
-jobinfo_field_jobdesc=任務描述
+jobinfo_field_jobdesc=任務名稱
 jobinfo_field_gluetype=運行模式
 jobinfo_field_executorparam=任務參數
 jobinfo_field_author=負責人
@@ -202,7 +202,7 @@ jobgroup_list=執行器列表
 jobgroup_add=新增執行器
 jobgroup_edit=編輯執行器
 jobgroup_del=刪除執行器
-jobgroup_field_title=名稱
+jobgroup_field_title=執行器名稱
 jobgroup_field_addressType=注冊方式
 jobgroup_field_addressType_0=自動注冊
 jobgroup_field_addressType_1=手動登錄
diff --git a/xxl-job-admin/src/main/resources/templates/business/group.list.ftl b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl
index 94001c7c..5973e2b7 100644
--- a/xxl-job-admin/src/main/resources/templates/business/group.list.ftl
+++ b/xxl-job-admin/src/main/resources/templates/business/group.list.ftl
@@ -95,15 +95,15 @@
 						<form class="form-horizontal form" role="form" >
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">AppName<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="appname" placeholder="${I18n.system_please_input}AppName" maxlength="64" ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="appname" placeholder="${I18n.system_please_input}AppName" maxlength="64" ></div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_title}<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="name" placeholder="${I18n.system_please_input}${I18n.jobgroup_field_title}" maxlength="64" ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="name" placeholder="${I18n.system_please_input}${I18n.jobgroup_field_title}" maxlength="64" ></div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_addressType}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<input type="radio" name="addressType" value="0" checked />${I18n.jobgroup_field_addressType_0}
 									&nbsp;&nbsp;&nbsp;&nbsp;
 									<input type="radio" name="addressType" value="1" />${I18n.jobgroup_field_addressType_1}
@@ -111,13 +111,13 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_registryList}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<textarea class="textarea" name="addressList" maxlength="20000" placeholder="${I18n.jobgroup_field_registryList_placeholder}" readonly="readonly" style="background-color:#eee; width: 100%; height: 100px; font-size: 14px; line-height: 15px; border: 1px solid #dddddd; padding: 5px;"></textarea>
 								</div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">AccessToken<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="accessToken" placeholder="${I18n.system_please_input}AccessToken" maxlength="50" ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="accessToken" placeholder="${I18n.system_please_input}AccessToken" maxlength="50" ></div>
 							</div>
 							<hr>
 							<div class="form-group">
@@ -143,15 +143,15 @@
 						<form class="form-horizontal form" role="form" >
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">AppName<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="appname" placeholder="${I18n.system_please_input}AppName" maxlength="64" readonly ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="appname" placeholder="${I18n.system_please_input}AppName" maxlength="64" readonly ></div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_title}<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="name" placeholder="${I18n.system_please_input}${I18n.jobgroup_field_title}" maxlength="64" ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="name" placeholder="${I18n.system_please_input}${I18n.jobgroup_field_title}" maxlength="64" ></div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_addressType}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<input type="radio" name="addressType" value="0" />${I18n.jobgroup_field_addressType_0}
 									&nbsp;&nbsp;&nbsp;&nbsp;
 									<input type="radio" name="addressType" value="1" />${I18n.jobgroup_field_addressType_1}
@@ -159,13 +159,13 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.jobgroup_field_registryList}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<textarea class="textarea" name="addressList" maxlength="20000" placeholder="${I18n.jobgroup_field_registryList_placeholder}" readonly="readonly" style="background-color:#eee; width: 100%; height: 100px; font-size: 14px; line-height: 15px; border: 1px solid #dddddd; padding: 5px;"></textarea>
 								</div>
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">AccessToken<font color="red">*</font></label>
-								<div class="col-sm-10"><input type="text" class="form-control" name="accessToken" placeholder="${I18n.system_please_input}AccessToken" maxlength="50" ></div>
+								<div class="col-sm-9"><input type="text" class="form-control" name="accessToken" placeholder="${I18n.system_please_input}AccessToken" maxlength="50" ></div>
 							</div>
 							<hr>
 							<div class="form-group">
diff --git a/xxl-job-admin/src/main/resources/templates/business/job.code.ftl b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl
index 7d112cb3..810c79a6 100644
--- a/xxl-job-admin/src/main/resources/templates/business/job.code.ftl
+++ b/xxl-job-admin/src/main/resources/templates/business/job.code.ftl
@@ -106,11 +106,11 @@
 					<div class="form-horizontal form" role="form" >
 						<div class="form-group">
 							<label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_glue_remark}<font color="red">*</font></label>
-							<div class="col-sm-10"><input type="text" class="form-control" id="glueRemark" placeholder="${I18n.system_please_input}${I18n.jobinfo_glue_remark}" maxlength="64" ></div>
+							<div class="col-sm-9"><input type="text" class="form-control" id="glueRemark" placeholder="${I18n.system_please_input}${I18n.jobinfo_glue_remark}" maxlength="64" ></div>
 						</div>
 						<hr>
 						<div class="form-group">
-							<div class="col-sm-offset-3 col-sm-6">
+							<div class="col-sm-offset-4 col-sm-4">
 								<button type="button" class="btn btn-primary ok" >${I18n.system_save}</button>
 								<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.system_cancel}</button>
 							</div>
diff --git a/xxl-job-admin/src/main/resources/templates/business/job.list.ftl b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl
index c406776b..236e0132 100644
--- a/xxl-job-admin/src/main/resources/templates/business/job.list.ftl
+++ b/xxl-job-admin/src/main/resources/templates/business/job.list.ftl
@@ -511,19 +511,19 @@ exit 0
 						<form class="form-horizontal form" role="form" >
 							<div class="form-group">
 								<label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorparam}<font color="black">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<textarea class="textarea form-control" name="executorParam" placeholder="${I18n.system_please_input}${I18n.jobinfo_field_executorparam}" maxlength="2048" style="height: 70px; line-height: 1.2;"></textarea>
 								</div>
 							</div>
 							<div class="form-group">
 								<label for="firstname" class="col-sm-2 control-label">${I18n.jobgroup_field_registryList}<font color="black">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-9">
 									<textarea class="textarea form-control" name="addressList" placeholder="${I18n.jobinfo_opt_run_tips}" maxlength="512" style="height: 63px; line-height: 1.2;"></textarea>
 								</div>
 							</div>
 							<hr>
 							<div class="form-group">
-								<div class="col-sm-offset-3 col-sm-6">
+								<div class="col-sm-offset-4 col-sm-4">
 									<button type="button" class="btn btn-primary ok" >${I18n.system_save}</button>
 									<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.system_cancel}</button>
 									<input type="hidden" name="id" >
diff --git a/xxl-job-admin/src/main/resources/templates/business/log.list.ftl b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl
index 6be08d14..11e596a3 100644
--- a/xxl-job-admin/src/main/resources/templates/business/log.list.ftl
+++ b/xxl-job-admin/src/main/resources/templates/business/log.list.ftl
@@ -109,7 +109,7 @@
 					<div class="modal-body">
 						<form class="form-horizontal form" role="form" >
 							<div class="form-group">
-								<label class="col-sm-3 control-label">${I18n.jobinfo_field_jobgroup}：</label>
+								<label class="col-sm-2 control-label">${I18n.jobinfo_field_jobgroup}：</label>
 								<div class="col-sm-9">
 									<input type="text" class="form-control jobGroupText" readonly >
 									<input type="hidden" name="jobGroup" >
@@ -117,7 +117,7 @@
 							</div>
 
 							<div class="form-group">
-								<label class="col-sm-3 control-label">${I18n.jobinfo_job}：</label>
+								<label class="col-sm-2 control-label">${I18n.jobinfo_job}：</label>
 								<div class="col-sm-9">
 									<input type="text" class="form-control jobIdText" readonly >
 									<input type="hidden" name="jobId" >
@@ -125,7 +125,7 @@
 							</div>
 
 							<div class="form-group">
-								<label class="col-sm-3 control-label">${I18n.joblog_clean_type}：</label>
+								<label class="col-sm-2 control-label">${I18n.joblog_clean_type}：</label>
 								<div class="col-sm-9">
 									<select class="form-control" name="type" >
 										<option value="1" >${I18n.joblog_clean_type_1}</option>
@@ -143,7 +143,7 @@
 
 							<hr>
 							<div class="form-group">
-								<div class="col-sm-offset-3 col-sm-6">
+								<div class="col-sm-offset-4 col-sm-4">
 									<button type="button" class="btn btn-primary ok" >${I18n.system_ok}</button>
 									<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.system_cancel}</button>
 								</div>
diff --git a/xxl-job-admin/src/main/resources/templates/business/user.list.ftl b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl
index 4d92bbba..9f3cbb21 100644
--- a/xxl-job-admin/src/main/resources/templates/business/user.list.ftl
+++ b/xxl-job-admin/src/main/resources/templates/business/user.list.ftl
@@ -88,7 +88,7 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-8">
 									<input type="radio" name="role" value="0" checked />${I18n.user_role_normal}
 									&nbsp;&nbsp;&nbsp;&nbsp;
 									<input type="radio" name="role" value="1" />${I18n.user_role_admin}
@@ -96,7 +96,7 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.user_permission}<font color="black">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-8">
 									<#if groupList?exists && groupList?size gt 0>
 										<#list groupList as item>
 											<input type="checkbox" name="permission" value="${item.id}" />&nbsp;&nbsp;${item.name}：${item.appname}
@@ -139,7 +139,7 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-8">
 									<input type="radio" name="role" value="0" />${I18n.user_role_normal}
 									&nbsp;&nbsp;&nbsp;&nbsp;
 									<input type="radio" name="role" value="1" />${I18n.user_role_admin}
@@ -147,7 +147,7 @@
 							</div>
 							<div class="form-group">
 								<label for="lastname" class="col-sm-2 control-label">${I18n.user_permission}<font color="black">*</font></label>
-								<div class="col-sm-10">
+								<div class="col-sm-8">
 									<#if groupList?exists && groupList?size gt 0>
 										<#list groupList as item>
 											<input type="checkbox" name="permission" value="${item.id}" />${item.name}(${item.appname})<br>