diff --git a/src/main/twirl/account/info.scala.html b/src/main/twirl/account/info.scala.html
index 3905da2..4e41b1a 100644
--- a/src/main/twirl/account/info.scala.html
+++ b/src/main/twirl/account/info.scala.html
@@ -27,21 +27,25 @@
           </li>
           }
         </ul>
-        @repositories.map { repository =>
-        <div class="block">
-          <div class="block-header">
-            <a href="@url(repository.owner)">@repository.owner</a>
-            /
-            <a href="@url(repository)">@repository.name</a>
-            @if(repository.repository.isPrivate){
-              <i class="icon-lock"></i>
-            }
-          </div>
-          @if(repository.repository.description.isDefined){
-            <div>@repository.repository.description</div>
+        @if(repositories.isEmpty){
+          No repositories
+        } else {
+          @repositories.map { repository =>
+            <div class="block">
+              <div class="block-header">
+                <a href="@url(repository.owner)">@repository.owner</a>
+                /
+                <a href="@url(repository)">@repository.name</a>
+                @if(repository.repository.isPrivate){
+                  <i class="icon-lock"></i>
+                }
+              </div>
+              @if(repository.repository.description.isDefined){
+                <div>@repository.repository.description</div>
+              }
+              <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
+            </div>
           }
-          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
-        </div>
         }
       </div>
     </div>
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
index 7c72656..6683f00 100644
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -6,21 +6,25 @@
 <div class="row-fluid">
   <div class="span8">
   <h3>Recent updated repositories</h3>
-  @repositories.map { repository =>
-    <div class="block">
-      <div class="block-header">
-        <a href="@url(repository.owner)">@repository.owner</a>
-        /
-        <a href="@url(repository)">@repository.name</a>
-        @if(repository.repository.isPrivate){
-          <i class="icon-lock"></i>
+  @if(repositories.isEmpty){
+    No repositories
+  } else {
+    @repositories.map { repository =>
+      <div class="block">
+        <div class="block-header">
+          <a href="@url(repository.owner)">@repository.owner</a>
+          /
+          <a href="@url(repository)">@repository.name</a>
+          @if(repository.repository.isPrivate){
+            <i class="icon-lock"></i>
+          }
+        </div>
+        @if(repository.repository.description.isDefined){
+          <div>@repository.repository.description</div>
         }
+        <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
       </div>
-      @if(repository.repository.description.isDefined){
-        <div>@repository.repository.description</div>
-      }
-      <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
-    </div>
+    }
   }
   </div>
   <div class="span4">
@@ -29,12 +33,23 @@
     } else {
       <table class="table table-bordered">
         <tr>
-          <th class="metal">Your repositories (@userRepositories.size)</th>
+          <th class="metal">
+            <div class="pull-right">
+              <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
+            </div>
+            Your repositories (@userRepositories.size)
+          </th>
         </tr>
-        @userRepositories.map { repositoryName =>
+        @if(userRepositories.isEmpty){
           <tr>
-            <td><a href="@path/@loginAccount.get.userName/@repositoryName">@repositoryName</a></td>
+            <td>No repositories</td>
           </tr>
+        } else {
+          @userRepositories.map { repositoryName =>
+            <tr>
+              <td><a href="@path/@loginAccount.get.userName/@repositoryName">@repositoryName</a></td>
+            </tr>
+          }
         }
       </table>
     }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 679656c..f7a7198 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -104,7 +104,7 @@
 div.block {
   padding-top: 10px;
   padding-bottom: 10px;
-  border-bottom: 1px solid silver;
+  border-bottom: 1px solid #ddd;
 }
 
 h3 {