diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index d58c77ad1..228621771 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,103 +1,103 @@
 {{template "base/head" .}}
 <div class="organization settings options">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.i18n.Tr "org.settings.options"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="required field {{if .Err_Name}}error{{end}}">
-							<label for="org_name">{{.i18n.Tr "org.org_name_holder"}}<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span></label>
-							<input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
-						</div>
-						<div class="field {{if .Err_FullName}}error{{end}}">
-							<label for="full_name">{{.i18n.Tr "org.org_full_name_holder"}}</label>
-							<input id="full_name" name="full_name" value="{{.Org.FullName}}">
-						</div>
-						<div class="field {{if .Err_Description}}error{{end}}">
-							<label for="description">{{$.i18n.Tr "org.org_desc"}}</label>
-							<textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea>
-						</div>
-						<div class="field {{if .Err_Website}}error{{end}}">
-							<label for="website">{{.i18n.Tr "org.settings.website"}}</label>
-							<input id="website" name="website" type="url" value="{{.Org.Website}}">
-						</div>
-						<div class="field">
-							<label for="location">{{.i18n.Tr "org.settings.location"}}</label>
-							<input id="location" name="location"  value="{{.Org.Location}}">
-						</div>
+  {{template "org/header" .}}
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "org/settings/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "org.settings.options"}}
+        </h4>
+        <div class="ui attached segment">
+          <form class="ui form" action="{{.Link}}" method="post">
+            {{.CsrfTokenHtml}}
+            <div class="required field {{if .Err_Name}}error{{end}}">
+              <label for="org_name">{{.i18n.Tr "org.org_name_holder"}}<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span></label>
+              <input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
+            </div>
+            <div class="field {{if .Err_FullName}}error{{end}}">
+              <label for="full_name">{{.i18n.Tr "org.org_full_name_holder"}}</label>
+              <input id="full_name" name="full_name" value="{{.Org.FullName}}">
+            </div>
+            <div class="field {{if .Err_Description}}error{{end}}">
+              <label for="description">{{$.i18n.Tr "org.org_desc"}}</label>
+              <textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea>
+            </div>
+            <div class="field {{if .Err_Website}}error{{end}}">
+              <label for="website">{{.i18n.Tr "org.settings.website"}}</label>
+              <input id="website" name="website" type="url" value="{{.Org.Website}}">
+            </div>
+            <div class="field">
+              <label for="location">{{.i18n.Tr "org.settings.location"}}</label>
+              <input id="location" name="location"  value="{{.Org.Location}}">
+            </div>
 
-						<div class="ui divider"></div>
-						<div class="field" id="visibility_box">
-							<label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}/>
-									<label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}/>
-									<label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}/>
-									<label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
-								</div>
-							</div>
-						</div>
+            <div class="ui divider"></div>
+            <div class="field" id="visibility_box">
+              <label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label>
+              <div class="field">
+                <div class="ui radio checkbox">
+                  <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}/>
+                  <label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
+                </div>
+              </div>
+              <div class="field">
+                <div class="ui radio checkbox">
+                  <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}/>
+                  <label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
+                </div>
+              </div>
+              <div class="field">
+                <div class="ui radio checkbox">
+                  <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}/>
+                  <label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
+                </div>
+              </div>
+            </div>
 
-						<div class="field" id="permission_box">
-							<label>{{.i18n.Tr "org.settings.permission"}}</label>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .RepoAdminChangeTeamAccess}}checked{{end}}/>
-									<label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>
-								</div>
-							</div>
-						</div>
+            <div class="field" id="permission_box">
+              <label>{{.i18n.Tr "org.settings.permission"}}</label>
+              <div class="field">
+                <div class="ui checkbox">
+                  <input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .RepoAdminChangeTeamAccess}}checked{{end}}/>
+                  <label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>
+                </div>
+              </div>
+            </div>
 
-						{{if .SignedUser.IsAdmin}}
-						<div class="ui divider"></div>
+            {{if .SignedUser.IsAdmin}}
+            <div class="ui divider"></div>
 
-						<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
-							<label for="max_repo_creation">{{.i18n.Tr "admin.users.max_repo_creation"}}</label>
-							<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Org.MaxRepoCreation}}">
-							<p class="help">{{.i18n.Tr "admin.users.max_repo_creation_desc"}}</p>
-						</div>
-						{{end}}
+            <div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
+              <label for="max_repo_creation">{{.i18n.Tr "admin.users.max_repo_creation"}}</label>
+              <input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Org.MaxRepoCreation}}">
+              <p class="help">{{.i18n.Tr "admin.users.max_repo_creation_desc"}}</p>
+            </div>
+            {{end}}
 
-						<div class="field">
-							<button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button>
-						</div>
-					</form>
+            <div class="field">
+              <button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button>
+            </div>
+          </form>
 
-					<div class="ui divider"></div>
+          <div class="ui divider"></div>
 
-					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-						{{.CsrfTokenHtml}}
-						<div class="inline field">
-							<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-							<input name="avatar" type="file" >
-						</div>
+          <form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+            {{.CsrfTokenHtml}}
+            <div class="inline field">
+              <label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+              <input name="avatar" type="file" >
+            </div>
 
-						<div class="field">
-							<button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
-							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
+            <div class="field">
+              <button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
+              <a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/cloudbrain/cloudbrain_list.tmpl b/templates/repo/cloudbrain/cloudbrain_list.tmpl
new file mode 100644
index 000000000..6a881c779
--- /dev/null
+++ b/templates/repo/cloudbrain/cloudbrain_list.tmpl
@@ -0,0 +1,26 @@
+<div class="ui grid item">
+  <div class="row">
+    <div class="five wide column">
+      <a class="title" href="#">
+        <span class="fitted">{{svg "octicon-tasklist" 16}}</span>
+        <span class="fitted">任务名</span>
+      </a>
+    </div>
+    <div class="two wide column">
+      waiting
+    </div>
+    <div class="three wide column">
+      <span class="ui text center">{{svg "octicon-flame" 16}} 2020-07-13 16:06:08</span>
+    </div>
+
+    <div class="two wide column">
+      <span class="ui text center clipboard">18h 0m 8s</span>
+    </div>
+    <div class="two wide column">
+      <span class="ui text center clipboard">Stop</span>
+    </div>
+    <div class="two wide column">
+      <span class="ui text center clipboard">再次提交</span>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl
index 399d17520..e0199e9e0 100644
--- a/templates/repo/cloudbrain/index.tmpl
+++ b/templates/repo/cloudbrain/index.tmpl
@@ -1,5 +1,40 @@
 {{template "base/head" .}}
 <div class="repository release dataset-list view">
 	{{template "repo/header" .}}
+	<div class="ui container">
+		<div class="ui three column stackable grid">
+			<div class="column">
+				<h2>{{.i18n.Tr "cloudbrain"}}</h2>
+			</div>
+			<div class="column">
+			</div>
+			<div class="column right aligned">
+				<a class="ui green button" href="{{.RepoLink}}/cloudbrain/new">{{.i18n.Tr "repo.cloudbrain.new"}}</a>
+			</div>
+		</div>
+    <div class="ui divider"></div>
+		<div class="ui grid">
+			<div class="row">
+				<div class="ui sixteen wide column">
+					<div class="ui sixteen wide column">
+						<div class="ui two column stackable grid">
+							<div class="column">
+							</div>
+							<div class="column right aligned">
+								<div class="ui right dropdown type jump item">
+									<span class="text">
+										{{.i18n.Tr "repo.issues.filter_sort"}}<i class="dropdown icon"></i>
+									</span>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="dataset list">
+						{{template "repo/cloudbrain/cloudbrain_list" .}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl
index 399d17520..394855d9b 100644
--- a/templates/repo/cloudbrain/new.tmpl
+++ b/templates/repo/cloudbrain/new.tmpl
@@ -1,5 +1,33 @@
 {{template "base/head" .}}
-<div class="repository release dataset-list view">
+<div class="repository new repo">
 	{{template "repo/header" .}}
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<form class="ui form" action="/repo/create" method="post">
+				{{.CsrfTokenHtml}}
+				<h3 class="ui top attached header">
+					New Cloudbrain task
+				</h3>
+				<div class="ui attached segment">
+					<br>
+					<div class="inline required field">
+						<label>镜像</label>
+						<input name="title" id="issue_title" placeholder="输入镜像" value="{{.image}}" tabindex="3" autofocus required maxlength="255">
+					</div>
+					<div class="inline required field">
+						<label>启动命令</label>
+						<textarea name="command" rows="10">{{.command}}</textarea>
+					</div>
+					<div class="inline field">
+						<label></label>
+						<button class="ui green button">
+							Create Cloudbrain
+						</button>
+						<a class="ui button" href="/">Cancel</a>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 </div>
 {{template "base/footer" .}}