diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl
index b554a3a756..9c634dba34 100644
--- a/templates/repo/migrate/gitbucket.tmpl
+++ b/templates/repo/migrate/gitbucket.tmpl
@@ -22,7 +22,6 @@
 						<label for="auth_username">{{.i18n.Tr "username"}}</label>
 						<input id="auth_username" name="auth_username" value="{{.auth_username}}" {{if not .auth_username}}data-need-clear="true"{{end}}>
 					</div>
-					<input class="fake" type="password">
 					<div class="inline field {{if .Err_Auth}}error{{end}}">
 						<label for="auth_password">{{.i18n.Tr "password"}}</label>
 						<input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">
@@ -30,19 +29,16 @@
 
 					{{template "repo/migrate/options" .}}
 
-					<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
-					<div id="migrate_items">
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.migrate_items"}}</label>
-							<div class="ui checkbox">
-								<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
-							</div>
-							<div class="ui checkbox">
-								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
-							</div>
+					<div class="inline field">
+						<label>{{.i18n.Tr "repo.migrate_items"}}</label>
+						<div class="ui checkbox">
+							<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
+							<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
 						</div>
+					</div>
+
+					<div id="migrate_items">
+						<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
@@ -65,6 +61,13 @@
 								<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
 							</div>
 						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
+								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
+							</div>
+						</div>
 					</div>
 
 					<div class="ui divider"></div>
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 901524d112..d0532923e1 100644
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -26,19 +26,16 @@
 
 					{{template "repo/migrate/options" .}}
 
-					<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
-					<div id="migrate_items">
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.migrate_items"}}</label>
-							<div class="ui checkbox">
-								<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
-							</div>
-							<div class="ui checkbox">
-								<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
-							</div>
+					<div class="inline field">
+						<label>{{.i18n.Tr "repo.migrate_items"}}</label>
+						<div class="ui checkbox">
+							<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
+							<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
 						</div>
+					</div>
+
+					<div id="migrate_items">
+						<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
@@ -61,6 +58,13 @@
 								<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
 							</div>
 						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
+								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
+							</div>
+						</div>
 					</div>
 
 					<div class="ui divider"></div>
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index 9bd7228a43..1dfd164c85 100644
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -29,19 +29,15 @@
 
 					{{template "repo/migrate/options" .}}
 
-					<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
-					<div id="migrate_items">
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.migrate_items"}}</label>
-							<div class="ui checkbox">
-								<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
-							</div>
-							<div class="ui checkbox">
-								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
-							</div>
+					<div class="inline field">
+						<label>{{.i18n.Tr "repo.migrate_items"}}</label>
+						<div class="ui checkbox">
+							<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
+							<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
 						</div>
+					</div>
+					<div id="migrate_items">
+						<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
@@ -64,6 +60,13 @@
 								<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
 							</div>
 						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
+								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
+							</div>
+						</div>
 					</div>
 
 					<div class="ui divider"></div>
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index e1424c250f..b730164a8f 100644
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -26,19 +26,15 @@
 
 					{{template "repo/migrate/options" .}}
 
-					<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
-					<div id="migrate_items">
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.migrate_items"}}</label>
-							<div class="ui checkbox">
-								<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
-							</div>
-							<div class="ui checkbox">
-								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
-							</div>
+					<div class="inline field">
+						<label>{{.i18n.Tr "repo.migrate_items"}}</label>
+						<div class="ui checkbox">
+							<input name="wiki" type="checkbox" {{if .wiki}}checked{{end}}>
+							<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
 						</div>
+					</div>
+					<div id="migrate_items">
+						<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
@@ -61,6 +57,13 @@
 								<label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label>
 							</div>
 						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
+								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
+							</div>
+						</div>
 					</div>
 
 					<div class="ui divider"></div>
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
index b1900e83d1..c35ef017b3 100644
--- a/templates/repo/migrate/gogs.tmpl
+++ b/templates/repo/migrate/gogs.tmpl
@@ -26,19 +26,16 @@
 
 					{{template "repo/migrate/options" .}}
 
-					<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
-					<div id="migrate_items">
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.migrate_items"}}</label>
-							<div class="ui checkbox">
-								<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
-							</div>
-							<div class="ui checkbox">
-								<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
-								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
-							</div>
+					<div class="inline field">
+						<label>{{.i18n.Tr "repo.migrate_items"}}</label>
+						<div class="ui checkbox">
+							<input name="wiki" type="checkbox" {{if .wiki}} checked{{end}}>
+							<label>{{.i18n.Tr "repo.migrate_items_wiki" | Safe}}</label>
 						</div>
+					</div>
+
+					<div id="migrate_items">
+						<span class="help">{{.i18n.Tr "repo.migrate.migrate_items_options"}}</span>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
@@ -50,6 +47,13 @@
 								<label>{{.i18n.Tr "repo.migrate_items_issues" | Safe}}</label>
 							</div>
 						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}} checked{{end}}>
+								<label>{{.i18n.Tr "repo.migrate_items_milestones" | Safe}}</label>
+							</div>
+						</div>
 						<!-- Gogs do not support it
 						<div class="inline field">
 							<label></label>
diff --git a/web_src/less/_form.less b/web_src/less/_form.less
index 9c14e9571d..1a92b8e369 100644
--- a/web_src/less/_form.less
+++ b/web_src/less/_form.less
@@ -135,7 +135,6 @@ textarea:focus,
 .form {
   .help {
     color: #999999;
-    padding-top: .6em;
     padding-bottom: .6em;
     display: inline-block;
   }