diff --git a/README.md b/README.md
index af98f7e..b76e65d 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,11 @@
 - [x] [org/home](./org/home.tmpl)
 - [x] [repo/clone_buttons](./repo/clone_buttons.tmpl)
 - [x] [repo/course_view_list](./repo/course_view_list.tmpl)
-- [ ] [repo/home](./repo/home.tmpl)
-- [ ] [repo/sub_menu](./repo/sub_menu.tmpl)
-- [ ] [user/dashboard/courses](./user/dashboard/courses.tmpl)
-- [ ] [user/dashboard/dashboard](./user/dashboard/dashboard.tmpl)
-- [ ] [user/dashboard/named_feeds](./user/dashboard/named_feeds.tmpl)
+- [x] [repo/home](./repo/home.tmpl)
+- [x] [repo/sub_menu](./repo/sub_menu.tmpl)
+- [x] [user/dashboard/courses](./user/dashboard/courses.tmpl)
+- [x] [user/dashboard/dashboard](./user/dashboard/dashboard.tmpl)
+- [x] [user/dashboard/named_feeds](./user/dashboard/named_feeds.tmpl)
 - [ ] [user/settings/account](./user/settings/account.tmpl)
 - [ ] [user/settings/keys](./user/settings/keys.tmpl)
 - [ ] [user/settings/navbar](./user/settings/keys.tmpl)
diff --git a/repo/home.tmpl b/repo/home.tmpl
index ef76f3e..270ef89 100644
--- a/repo/home.tmpl
+++ b/repo/home.tmpl
@@ -1,36 +1,22 @@
 {{template "base/head" .}}
+{{$n := len .TreeNames}}
+{{$l := Eval $n "-" 1}}
+{{$isHomepage := (eq $n 0)}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
-		{{template "repo/code/recently_pushed_new_branches" .}}
-		{{if and (not .HideRepoInfo) (not .IsBlame)}}
-		<div class="repo-description gt-word-break">
-			{{- $description := .Repository.DescriptionHTML ctx -}}
-			{{if $description}}{{$description | RenderCodeBlock}}{{end}}
-			{{if .Repository.Website}}<a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}
-		</div>
-		<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-2 tw-my-2" id="repo-topics">
-			{{/* it should match the code in issue-home.js */}}
-			{{range .Topics}}<a class="repo-topic ui large label" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
-			{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>{{end}}
-		</div>
-		{{end}}
 		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
-		<div class="ui form tw-hidden tw-flex tw-gap-2 tw-my-2" id="topic_edit">
-			<div class="ui fluid multiple search selection dropdown tw-flex-wrap tw-flex-1">
-				<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}">
-				{{range .Topics}}
-					{{/* keep the same layout as Fomantic UI generated labels */}}
-					<a class="ui label transition visible tw-cursor-default tw-inline-block" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a>
-				{{end}}
-				<div class="text"></div>
+			<div class="ui form tw-hidden tw-flex tw-gap-2 tw-my-2" id="topic_edit">
+					<div class="ui fluid multiple search selection dropdown tw-flex-wrap tw-flex-1">
+						<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}">
+							{{range .Topics}}
+								{{/* keep the same layout as Fomantic UI generated labels */}}
+								<a class="ui label transition visible tw-cursor-default tw-inline-block" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a>
+							{{end}}
+						<div class="text"></div>
+					</div>
 			</div>
-			<div>
-				<button class="ui basic button" id="cancel_topic_edit">{{ctx.Locale.Tr "cancel"}}</button>
-				<button class="ui primary button" id="save_topic" data-link="{{.RepoLink}}/topics">{{ctx.Locale.Tr "save"}}</button>
-			</div>
-		</div>
 		{{end}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message tw-text-center">
@@ -42,9 +28,6 @@
 			</div>
 		{{end}}
 		{{template "repo/sub_menu" .}}
-		{{$n := len .TreeNames}}
-		{{$l := Eval $n "-" 1}}
-		{{$isHomepage := (eq $n 0)}}
 		<div class="repo-button-row" data-is-homepage="{{$isHomepage}}">
 			<div class="repo-button-row-left">
 				{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}}
diff --git a/user/dashboard/dashboard.tmpl b/user/dashboard/dashboard.tmpl
index 5dc46dc..a050d2f 100644
--- a/user/dashboard/dashboard.tmpl
+++ b/user/dashboard/dashboard.tmpl
@@ -3,9 +3,10 @@
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container flex-container">
 		<div class="flex-container-main">
-			{{template "base/alert" .}}
-			{{template "user/heatmap" .}}
-			{{template "user/dashboard/feeds" .}}
+			<div class="ui container flex-container">
+				{{template "user/dashboard/courses" .}}
+			</div>
+            {{template "user/dashboard/named_feeds" .}}
 		</div>
 		{{template "user/dashboard/repolist" .}}
 	</div>