diff --git a/custom/templates/base/head_navbar.tmpl b/custom/templates/base/head_navbar.tmpl
index 0bc80a53d..a61ae6e29 100644
--- a/custom/templates/base/head_navbar.tmpl
+++ b/custom/templates/base/head_navbar.tmpl
@@ -104,6 +104,9 @@
 					<a class="item" href="{{AppSubUrl}}/repo/create">
 						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
 					</a>
+					<a class="item" href="{{AppSubUrl}}/datasets/create">
+						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_dataset"}}
+					</a>
 					<a class="item" href="{{AppSubUrl}}/repo/migrate">
 						<span class="fitted">{{svg "octicon-repo-clone" 16}}</span> {{.i18n.Tr "new_migrate"}}
 					</a>
diff --git a/custom/templates/datasets/dataset_list.tmpl b/custom/templates/datasets/dataset_list.tmpl
new file mode 100644
index 000000000..934ddd6ad
--- /dev/null
+++ b/custom/templates/datasets/dataset_list.tmpl
@@ -0,0 +1,52 @@
+<div class="ui container">
+  <h2 class="ui left floated medium header">
+    {{.i18n.Tr "datasets"}}
+  </h2>
+  <div class="ui right floated secondary filter menu">
+    <!-- Sort -->
+    <div class="ui right dropdown type jump item">
+		<span class="text">
+			{{.i18n.Tr "repo.issues.filter_sort"}}
+                <i class="dropdown icon"></i>
+		</span>
+    <div class="menu">
+        <a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+        <a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
+        <a class="{{if eq .SortType "alphabetically"}}active{{end}} item" href="{{$.Link}}?sort=alphabetically&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
+        <a class="{{if eq .SortType "reversealphabetically"}}active{{end}} item" href="{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
+        <a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+        <a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+        <a class="{{if eq .SortType "moststars"}}active{{end}} item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+        <a class="{{if eq .SortType "feweststars"}}active{{end}} item" href="{{$.Link}}?sort=feweststars&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.feweststars"}}</a>
+        <a class="{{if eq .SortType "mostforks"}}active{{end}} item" href="{{$.Link}}?sort=mostforks&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.mostforks"}}</a>
+        <a class="{{if eq .SortType "fewestforks"}}active{{end}} item" href="{{$.Link}}?sort=fewestforks&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.fewestforks"}}</a>
+    </div>
+  </div>
+</div>
+
+<div class="ui container dataset list">
+  <div class="ui sixteen wide mobile ten wide tablet ten wide computer colum">
+    {{range .datasets}}
+      <div class="item">
+        <div class="ui header">
+          <a class="name" href="/datasets/{{.ID}}">
+            {{.Title}}
+          </a>
+          <div class="ui right metas">
+            <span class="text grey">{{svg "octicon-tasklist" 16}} {{.Task}}</span>
+            <span class="text grey">{{svg "octicon-tag" 16}}{{.Category}}</span>
+            <span class="text grey">{{svg "octicon-flame" 16}} 24</span>
+          </div>
+        </div>
+        <div class="description">
+          <a><div class="ui small label topic">{{.Description}}</div></a>
+          <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}</p>
+        </div>
+      </div>
+    {{else}}
+      <div>
+        {{$.i18n.Tr "explore.dataset_no_results"}}
+      </div>
+    {{end}}
+  </div>
+</div>
diff --git a/custom/templates/datasets/dataset_search.tmpl b/custom/templates/datasets/dataset_search.tmpl
new file mode 100644
index 000000000..6c973026a
--- /dev/null
+++ b/custom/templates/datasets/dataset_search.tmpl
@@ -0,0 +1,14 @@
+<div class="repos--seach">
+	<div class="ui container">
+		<div class="ui two column centered grid">
+			<form class="mobile ten wide tablet computer column ui form ignore-dirty">
+				<div class="ui fluid action input">
+					<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+					<input type="hidden" name="tab" value="{{$.TabName}}">
+					<input type="hidden" name="sort" value="{{$.SortType}}">
+					<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/custom/templates/datasets/index.tmpl b/custom/templates/datasets/index.tmpl
new file mode 100644
index 000000000..cefe2fc02
--- /dev/null
+++ b/custom/templates/datasets/index.tmpl
@@ -0,0 +1,9 @@
+{{template "base/head" .}}
+  <div class="explore repositories">
+    {{template "datasets/dataset_search" .}}
+    <div class="ui list">
+      {{template "datasets/dataset_list" .}}
+      {{template "base/paginate" .}}
+    </div>
+  </div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/custom/templates/explore/repo_search.tmpl b/custom/templates/explore/repo_search.tmpl
index 730546f4f..6c973026a 100644
--- a/custom/templates/explore/repo_search.tmpl
+++ b/custom/templates/explore/repo_search.tmpl
@@ -1,7 +1,7 @@
 <div class="repos--seach">
 	<div class="ui container">
 		<div class="ui two column centered grid">
-			<form class="sixteen wide mobile eight wide tablet eight wide computer column ui form ignore-dirty">
+			<form class="mobile ten wide tablet computer column ui form ignore-dirty">
 				<div class="ui fluid action input">
 					<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
 					<input type="hidden" name="tab" value="{{$.TabName}}">
@@ -9,9 +9,6 @@
 					<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
 				</div>
 			</form>
-			<div class="tablet only computer only eight wide tablet eight wide computer column" style="line-height: 2.5rem;">
-				热搜：
-			</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/custom/templates/explore/users.tmpl b/custom/templates/explore/users.tmpl
index c900d05a9..7b113e20d 100644
--- a/custom/templates/explore/users.tmpl
+++ b/custom/templates/explore/users.tmpl
@@ -4,8 +4,8 @@
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "explore/navbar" .}}
-			<div class="sixteen wide mobile ten wide tablet ten wide computer column">
-			
+			<div class="sixteen mobile ten wide tablet computer column">
+
 				<h2 class="ui left floated medium header">
 					{{.i18n.Tr "explore.users"}}
 				</h2>
@@ -26,9 +26,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="ui clearing divider"></div>
-				
+
 				<div class="ui user list">
 					{{range .Users}}
 						<div class="item">
@@ -56,7 +56,7 @@
 			<div class="sixteen wide mobile six wide tablet four wide computer column">
 				{{template "explore/repo_right" .}}
 			</div>
-			
+
 		</div>
 	</div>
 </div>