diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl
index 241fea851..60000647d 100644
--- a/templates/repo/bare.tmpl
+++ b/templates/repo/bare.tmpl
@@ -14,7 +14,10 @@
     <div id="repo-content" class="clear container">
         <div id="repo-bare">
             <div id="repo-bare-start" class="panel panel-radius">
-                <p class="panel-header"><strong>Quick Start</strong></p>
+                <div class="panel-header"> 
+                    <a class="btn btn-small btn-black btn-header btn-radius right" href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings"}}</a>
+                    <strong>Quick Start</strong>
+                </div>
                 <div class="panel-content">
                     <div id="repo-clone" class="clear text-center">
                         <h2>Clone this repository</h2>
diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl
index 917e6d1b7..2cd0eacb6 100644
--- a/templates/repo/settings/hook_new.tmpl
+++ b/templates/repo/settings/hook_new.tmpl
@@ -49,6 +49,7 @@
 							</form>
 	                    </div>
 	                </div>
+	                {{if .PageIsSettingsHooksEdit}}
 		            <br>
 	                <div id="setting-content">
 	                    <div id="repo-hooks-history-panel" class="panel panel-radius">
@@ -60,6 +61,7 @@
 	                        </ul>
 	                    </div>
 		            </div>
+		            {{end}}
 	            </div>
 	        </div>
 		</div>