diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
index 72d93d8..541e8ff 100644
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -5,7 +5,6 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @if(isEditable){
-  <hr/><br/>
   <form method="POST" validate="true" autocomplete="off">
     <div class="panel panel-default issue-comment-box">
       <div class="panel-body">
diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
index c90f963..fc0286f 100644
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -102,16 +102,16 @@
 </div>
 <div id="milestone-progress-area">
   @issue.flatMap(_.milestoneId).map { milestoneId =>
-    @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => {
+    @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
       @gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
-    }}
+    }
   }
 </div>
 <span id="label-milestone">
   @issue.flatMap(_.milestoneId).map { milestoneId =>
-    @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) => {
+    @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
       <a class="strong small username" href="@helpers.url(repository)/issues?milestone=@helpers.urlEncode(milestone.title)&state=open">@milestone.title</a>
-    }}
+    }
   }.getOrElse {
     <span class="muted small">No milestone</span>
   }
diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
index 3cc395a..9648526 100644
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -26,7 +26,7 @@
       case other => None
     }.exists(_.action == "merge")){ merged =>
       @if(!issue.closed){
-        <div class="check-conflict" style="display: none;">
+        <div class="check-conflict" style="display: none; margin-bottom: 20px;">
           <div class="issue-comment-box" style="background-color: #fbeed5">
             <div class="box-content" style="border: 1px solid #c09853; padding: 10px;">
               <img src="@helpers.assets("/common/images/indicator.gif")"/> Checking...
@@ -55,13 +55,13 @@
   <script>
   $(function(){
     @if(commits.nonEmpty){
-      var checkConflict = $('.check-conflict').show();
+      const checkConflict = $('.check-conflict').show();
       if(checkConflict.length){
         $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
       }
     }
     $('.delete-branch').click(function(e){
-      var branchName = $(e.target).data('name');
+      const branchName = $(e.target).data('name');
       return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
     });
   });