diff --git a/public/js/app.js b/public/js/app.js
index 9a58a6f2f2..f98fd03f82 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -291,7 +291,7 @@ function initRepository() {
             $clone.find('button[data-link]').on("click",function (e) {
                 var $this = $(this);
                 if (!$this.hasClass('btn-primary')) {
-                    $clone.find('.btn-primary').removeClass('btn-primary').addClass("btn-default");
+                    $clone.find('.input-group-btn .btn-primary').removeClass('btn-primary').addClass("btn-default");
                     $(this).addClass('btn-primary').removeClass('btn-default');
                     $url.val($this.data("link"));
                     $clone.find('span.clone-url').text($this.data('link'));
diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index 080cb72e57..2770328cb1 100644
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -30,6 +30,10 @@
                             </span>
                         </div>
                         <p class="help-block text-center">Need help cloning? Visit <a href="#">Help</a>!</p>
+                        <hr/>
+                        <div class="clone-zip text-center">
+                            <a class="btn btn-success btn-lg" href="#"><i class="fa fa-suitcase"></i>Download ZIP</a>
+                        </div>
                     </div>
                 </div>
                 <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="gogs-repo-watching" data-watch="/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch">
diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index a1c3cfbb26..56e6746c76 100644
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -9,7 +9,7 @@
         {{else}}
         <div class="source-toolbar">
             {{ $n := len .Treenames}}
-            {{if not .IsFile}}<button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button>{{end}}
+            {{if not .IsFile}}<button class="btn btn-default pull-right hidden"><i class="fa fa-plus-square"></i>Add File</button>{{end}}
             <div class="dropdown branch-switch">
                 <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>{{.Branchname}}&nbsp;&nbsp;
                     <b class="caret"></b></a>
diff --git a/templates/repo/single_file.tmpl b/templates/repo/single_file.tmpl
index 2a28f0b54a..7f07033703 100644
--- a/templates/repo/single_file.tmpl
+++ b/templates/repo/single_file.tmpl
@@ -3,9 +3,15 @@
         {{if .ReadmeExist}}
             <i class="icon fa fa-book"></i>
         {{else}}
+            <div class="btn-group pull-right">
+                <a class="btn btn-default hidden" href="#">Edit</a>
+                <a class="btn btn-default" href="#">Raw</a>
+                <a class="btn btn-default hidden" href="#">Blame</a>
+                <a class="btn btn-default hidden" href="#">History</a>
+                <a class="btn btn-danger hidden" href="#">Delete</a>
+            </div>
             <i class="icon fa fa-file-text-o"></i>
         {{end}}{{.FileName}}
-        <a class="btn btn-default pull-right" href="#">Raw</a>
     </div>
     {{if .FileIsLarge}}
         <div class="panel-footer">