diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 28cce85..4e8ffde 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -75,9 +75,9 @@
   </div>
   
   @readme.map { content =>
-  <div class="box">
+  <div id="readme" class="box">
     <div class="box-header">README.md</div>
     <div class="box-content">@markdown(content, repository, false, false)</div>
   </div>
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html
index f94f282..a976871 100644
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -17,8 +17,8 @@
     }
   </li>
   }
-  <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
-  <li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@id">Commits</a></li>
+  <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@encodeBranchName(id)">Files</a></li>
+  <li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@encodeBranchName(id)">Commits</a></li>
   <li@if(active=="branches"){ class="active"}><a href="@url(repository)/branches">Branches@if(repository.branchList.length > 0){ <span class="badge">@repository.branchList.length</span>}</a></li>
   <li@if(active=="tags"    ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
   <li class="pull-right">
@@ -28,7 +28,7 @@
   </li>
   <li class="pull-right" style="margin-right: 8px;">
     <div class="pull-right">
-      <a href="@{url(repository)}/archive/@{id}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
+      <a href="@{url(repository)}/archive/@{encodeBranchName(id)}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
     </div>
   </li>
 </ul>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 02964a8..5ed5768 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -458,6 +458,10 @@
   padding-left: 20px;
 }
 
+#readme .box-content {
+  padding: 30px;
+}
+
 /****************************************************************************/
 /* Issues */
 /****************************************************************************/
@@ -815,4 +819,4 @@
   -webkit-border-top-right-radius: 4px;
           border-top-right-radius: 4px;
   -moz-border-radius-topright: 4px;
-}
\ No newline at end of file
+}