diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 8bb58adb79..45ea693bc8 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -6,7 +6,8 @@
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
 				{{if .ProfileReadmeContent}}
-					<div id="readme_profile" class="render-content markup" data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
+				<div id="readme_profile" class="render-content markup"
+						 data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
 				{{end}}
 				{{template "shared/repo/search" .}}
 				{{template "shared/repo/list" .}}
@@ -16,15 +17,21 @@
 			{{if .ShowMemberAndTeamTab}}
 			<div class="ui five wide column">
 				{{if .CanCreateOrgRepo}}
-					<div class="tw-flex tw-flex-wrap tw-justify-center tw-gap-x-1 tw-gap-y-2 tw-mb-4">
-						<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
-						{{if not .DisableNewPullMirrors}}
-							<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
-						{{end}}
-					</div>
-					<div class="divider"></div>
+				<div class="tw-flex tw-flex-wrap tw-justify-center tw-gap-x-1 tw-gap-y-2 tw-mb-4">
+					<a class="ui primary button tw-grow"
+						 href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
+					{{if not .DisableNewPullMirrors}}
+					<a class="ui primary button tw-grow"
+						 href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
+					{{end}}
+				</div>
+				<div class="divider"></div>
 				{{end}}
-
+				<div class="ui five wide column">
+					<div class="tw-mb-4">
+						{{template "group/sidebar/menu" .}}
+					</div>
+				</div>
 				{{if and .ShowMemberAndTeamTab .ShowOrgProfileReadmeSelector}}
 				<div class="tw-my-4">
 					<div id="org-home-view-as-dropdown" class="ui dropdown jump">
@@ -36,7 +43,7 @@
 								{{svg "octicon-check" 14 (Iif (not .IsViewingOrgAsMember) "" "tw-invisible")}} {{ctx.Locale.Tr "settings.visibility.public"}}
 							</a>
 							<a href="?view_as=member" class="item {{if .IsViewingOrgAsMember}}selected{{end}}">
-								{{svg "octicon-check" 14 (Iif .IsViewingOrgAsMember "" "tw-invisible")}}  {{ctx.Locale.Tr "org.members.member"}}
+								{{svg "octicon-check" 14 (Iif .IsViewingOrgAsMember "" "tw-invisible")}} {{ctx.Locale.Tr "org.members.member"}}
 							</a>
 						</div>
 					</div>
@@ -47,40 +54,47 @@
 				{{end}}
 
 				{{if .NumMembers}}
-					<h4 class="ui top attached header tw-flex">
-						<strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
-						<a class="tw-text-text-light flex-text-inline" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
-					</h4>
-					<div class="ui attached segment members">
-						{{$isMember := .IsOrganizationMember}}
-						{{range .Members}}
-							{{if or $isMember (call $.IsPublicMember .ID)}}
-								<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
-							{{end}}
-						{{end}}
-					</div>
+				<h4 class="ui top attached header tw-flex">
+					<strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
+					<a class="tw-text-text-light flex-text-inline"
+						 href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
+				</h4>
+				<div class="ui attached segment members">
+					{{$isMember := .IsOrganizationMember}}
+					{{range .Members}}
+					{{if or $isMember (call $.IsPublicMember .ID)}}
+					<a href="{{.HomeLink}}"
+						 title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
+					{{end}}
+					{{end}}
+				</div>
 				{{end}}
 				{{if .IsOrganizationMember}}
-					<div class="ui top attached header tw-flex">
-						<strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
-						<a class="tw-text-text-light flex-text-inline" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
+				<div class="ui top attached header tw-flex">
+					<strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
+					<a class="tw-text-text-light flex-text-inline"
+						 href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
+				</div>
+				<div class="ui attached table segment teams">
+					{{range .Teams}}
+					<div class="item">
+						<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
+						<p class="tw-text-text-light">
+							<a class="muted"
+								 href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}
+							</a> ·
+							<a class="muted"
+								 href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}
+							</a>
+						</p>
 					</div>
-					<div class="ui attached table segment teams">
-						{{range .Teams}}
-							<div class="item">
-								<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
-								<p class="tw-text-text-light">
-									<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a> ·
-									<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
-								</p>
-							</div>
-						{{end}}
-					</div>
-					{{if .IsOrganizationOwner}}
-						<div class="ui bottom attached segment">
-							<a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
-						</div>
 					{{end}}
+				</div>
+				{{if .IsOrganizationOwner}}
+				<div class="ui bottom attached segment">
+					<a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
+				</div>
+				{{end}}
 				{{end}}
 			</div>
 			{{else}}