diff --git a/public/js/index.js b/public/js/index.js
index 4034853f03e..3560686c26c 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -788,6 +788,9 @@ function initPullRequestReview() {
     $('.btn-review').on('click', function(e) {
         e.preventDefault();
         $(this).closest('.dropdown').find('.menu').toggle('visible');
+    }).closest('.dropdown').find('.link.close').on('click', function(e) {
+        e.preventDefault();
+        $(this).closest('.menu').toggle('visible');
     });
 
     $('.code-view .lines-code,.code-view .lines-num')
diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl
index 4e6d44220ae..9b7397ecb14 100644
--- a/templates/repo/diff/comment_form.tmpl
+++ b/templates/repo/diff/comment_form.tmpl
@@ -27,9 +27,9 @@
 			{{else}}
 				<button name="is_review" value="true"  type="submit"
 						class="ui submit green tiny button btn-start-review">{{$.root.i18n.Tr "repo.diff.comment.start_review"}}</button>
+				<button type="submit"
+						class="ui submit tiny basic button btn-add-single">{{$.root.i18n.Tr "repo.diff.comment.add_single_comment"}}</button>
 			{{end}}
-			<button type="submit"
-					class="ui submit tiny basic button btn-add-single">{{$.root.i18n.Tr "repo.diff.comment.add_single_comment"}}</button>
 			<button type="button" class="ui submit tiny basic button btn-cancel">{{$.root.i18n.Tr "cancel"}}</button>
 		</div>
 	</div>
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 1c6d2460135..18221e36ed3 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -32,7 +32,7 @@
 		<div class="ui attached segment">
 			<div class="render-content markdown has-emoji">
 			{{if .RenderedContent}}
-							{{.RenderedContent|Str2html}}
+				{{.RenderedContent|Str2html}}
 			{{else}}
 				<span class="no-content">{{$.root.i18n.Tr "repo.issues.no_content"}}</span>
 			{{end}}
@@ -40,12 +40,12 @@
 			<div class="raw-content hide">{{.Content}}</div>
 			<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.root.RepoLink}}/comments/{{.ID}}" data-context="{{$.root.RepoLink}}"></div>
 		</div>
-	{{$reactions := .Reactions.GroupByType}}
-	{{if $reactions}}
-		<div class="ui attached segment reactions">
-		{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions }}
-		</div>
-	{{end}}
+		{{$reactions := .Reactions.GroupByType}}
+		{{if $reactions}}
+			<div class="ui attached segment reactions">
+			{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions }}
+			</div>
+		{{end}}
 	</div>
 </div>
 {{end}}
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl
index db993d443d6..2b49ac7296b 100644
--- a/templates/repo/diff/new_review.tmpl
+++ b/templates/repo/diff/new_review.tmpl
@@ -7,9 +7,7 @@
 		<div class="ui clearing segment">
 			<form class="ui form" action="{{.Link}}/reviews/submit" method="post">
 			{{.CsrfTokenHtml}}
-				<div class="ui right floated">
-					<button onclick="$('.btn-review').click()" type="button" class="ui tiny icon button"><i class="icon close"></i></button>
-				</div>
+				<i class="ui right floated link icon close"></i>
 				<div class="header">
 				{{$.i18n.Tr "repo.diff.review.header"}}
 				</div>