diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala
index b8b523c..ea98d6f 100644
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -4,8 +4,9 @@
 
 class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
-    context.mount(new CreateRepositoryController, "/new")
+    context.mount(new IndexController, "/")
     context.mount(new WikiController, "/*")
+    context.mount(new CreateRepositoryController, "/*")
     context.mount(new RepositoryViewerController, "/*")
     
     context.addListener(new ServletContextListener(){
diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala
index 61f4383..48a41d0 100644
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -13,11 +13,11 @@
   
   implicit val jsonFormats = DefaultFormats
   
-  implicit def context: Context = Context(servletContext.getContextPath)
+  implicit def context: Context = Context(servletContext.getContextPath, LoginUser)
   
   // TODO get from session
-  val LoginUser = System.getProperty("user.name")
+  private val LoginUser = System.getProperty("user.name")
   
 }
 
-case class Context(path: String)
\ No newline at end of file
+case class Context(path: String, loginUser: String)
\ No newline at end of file
diff --git a/src/main/scala/app/CreateRepositoryController.scala b/src/main/scala/app/CreateRepositoryController.scala
index 43cecfa..36256eb 100644
--- a/src/main/scala/app/CreateRepositoryController.scala
+++ b/src/main/scala/app/CreateRepositoryController.scala
@@ -23,15 +23,15 @@
   /**
    * Show the new repository form.
    */
-  get("/") {
+  get("/new") {
     html.newrepo()
   }
   
   /**
    * Create new repository.
    */
-  post("/", form) { form =>
-    val gitdir = getRepositoryDir(LoginUser, form.name)
+  post("/new", form) { form =>
+    val gitdir = getRepositoryDir(context.loginUser, form.name)
     val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
 
     repository.create
@@ -40,7 +40,7 @@
     config.setBoolean("http", null, "receivepack", true)
     config.save
 
-    val tmpdir = getInitRepositoryDir(LoginUser, form.name)
+    val tmpdir = getInitRepositoryDir(context.loginUser, form.name)
     try {
       // Clone the repository
       Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
@@ -62,7 +62,7 @@
     }
     
     // redirect to the repository
-    redirect("/%s/%s".format(LoginUser, form.name))
+    redirect("/%s/%s".format(context.loginUser, form.name))
   }
   
   /**
@@ -72,7 +72,7 @@
     def validate(name: String, value: String): Option[String] = {
       if(!value.matches("^[a-z0-9\\-_]+$")){
         Some("Repository name contains invalid character.")
-      } else if(getRepositories(LoginUser).contains(value)){
+      } else if(getRepositories(context.loginUser).contains(value)){
         Some("Repository already exists.")
       } else {
         None
diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala
new file mode 100644
index 0000000..1fffffa
--- /dev/null
+++ b/src/main/scala/app/IndexController.scala
@@ -0,0 +1,9 @@
+package app
+
+class IndexController extends ControllerBase {
+  
+  get("/"){
+    html.index()
+  }
+
+}
\ No newline at end of file
diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index ecb9718..6e931c3 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -63,7 +63,7 @@
     val repository = params("repository")
     
     WikiUtil.savePage(owner, repository, form.currentPageName, form.pageName, 
-        form.content, LoginUser, form.message.getOrElse(""))
+        form.content, context.loginUser, form.message.getOrElse(""))
     
     redirect("%s/%s/wiki/%s".format(owner, repository, form.pageName))
   }
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
new file mode 100644
index 0000000..d6f9b38
--- /dev/null
+++ b/src/main/twirl/index.scala.html
@@ -0,0 +1,9 @@
+@()(implicit context: app.Context)
+@import context._
+@main("GitBucket"){
+  <h1>GitBucket</h1>
+  <ul>
+    <li><a href="@path/@context.loginUser">User page</a></li>
+    <li><a href="@path/new">Create new repository</a></li>
+  </ul>
+}
\ No newline at end of file
diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html
index f745f9e..6b57be8 100644
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -31,7 +31,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav pull-right">
               <li><a href="@path/new">New repo</a></li>
-              <li><a href="#about">Account</a></li>
+              <li><a href="@path/@context.loginUser">Account</a></li>
               <li><a href="#users">Users</a></li>
               <li><a href="#contact">Sign out</a></li>
             </ul>
@@ -39,7 +39,7 @@
         </div>
       </div>
     </div>
-    <div class="container">
+    <div class="container body">
       @body
     </div>
   </body>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6bb6846..ea35a26 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -9,6 +9,9 @@
 
 div.container {
   width: 920px;
+}
+
+div.body {
   margin-bottom: 40px;
 }