diff --git a/templates/repo/issue/view_content/sidebar/dependencies.tmpl b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
index 7267e39d6a..1b7fcaa846 100644
--- a/templates/repo/issue/view_content/sidebar/dependencies.tmpl
+++ b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
@@ -1,4 +1,4 @@
-<div class="ui depending">
+<div class="ui form depending">
 	{{if (and (not .BlockedByDependencies) (not .BlockedByDependenciesNotPermitted) (not .BlockingDependencies) (not .BlockingDependenciesNotPermitted))}}
 		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.dependency.title"}}</strong></span>
 		<br>
diff --git a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
index 0b17ece669..b37c4462a5 100644
--- a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
+++ b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
@@ -5,20 +5,19 @@
 		{{ctx.Locale.Tr "repo.issues.due_date_invalid"}}
 	</div>
 	{{if ne .Issue.DeadlineUnix 0}}
-		<p>
-			<div class="tw-flex tw-justify-between tw-items-center">
-				<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
-					{{svg "octicon-calendar" 16 "tw-mr-2"}}
-					{{DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
-				</div>
-				<div>
-					{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
-						<a class="issue-due-edit muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "tw-mr-1"}}</a>
-						<a class="issue-due-remove muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_remove"}}">{{svg "octicon-trash"}}</a>
-					{{end}}
-				</div>
+		<p></p>
+		<div class="tw-flex tw-justify-between tw-items-center">
+			<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
+				{{svg "octicon-calendar" 16 "tw-mr-2"}}
+				{{DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
 			</div>
-		</p>
+			<div>
+				{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+					<a class="issue-due-edit muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_edit"}}">{{svg "octicon-pencil" 16 "tw-mr-1"}}</a>
+					<a class="issue-due-remove muted" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_form_remove"}}">{{svg "octicon-trash"}}</a>
+				{{end}}
+			</div>
+		</div>
 	{{else}}
 		<p>{{ctx.Locale.Tr "repo.issues.due_date_not_set"}}</p>
 	{{end}}
diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl
index 1b02769ad1..98e2a19256 100644
--- a/templates/repo/issue/view_content/sidebar/reference.tmpl
+++ b/templates/repo/issue/view_content/sidebar/reference.tmpl
@@ -1,4 +1,4 @@
-<div class="ui reference">
+<div class="ui form reference">
 	{{$issueReferenceLink := ""}}
 	{{if .Issue.IsPull}}
 		{{$issueReferenceLink = printf "%s!%d" .Issue.Repo.FullName .Issue.Index}}
@@ -10,6 +10,7 @@
 			{{ctx.Locale.Tr "discussion.sidebar.reference"}}
 		</strong>
 	</span>
+	<p></p>
 	<div class="ui equal width compact grid">
 		<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
 			<span class="text column truncate">{{$issueReferenceLink}}</span>
diff --git a/templates/repo/issue/view_content/sidebar/timetracking.tmpl b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
index 228e2d27a7..62df3d7f38 100644
--- a/templates/repo/issue/view_content/sidebar/timetracking.tmpl
+++ b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
@@ -48,9 +48,12 @@
 	</div>
 {{end}}
 {{if .WorkingUsers}}
+	{{if or (not .CanUseTimetracker) (.Repository.IsArchived)}}
 	<div class="divider"></div>
+	{{end}}
 	<div class="ui comments">
 		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}}</strong></span>
+		<p></p>
 		<div>
 			{{range $user, $trackedtime := .WorkingUsers}}
 				<div class="comment tw-mt-2">