diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index 1edf66b..69208d6 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -13,4 +13,23 @@
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
+  get("/:owner/:repository/wiki/:page"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    val page       = params("page")
+    
+    html.wiki(page, 
+        WikiUtil.getPage(owner, repository, page), 
+        JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
+  
+  get("/:owner/:repository/wiki/:page/_edit"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    val page       = params("page")
+    
+    html.wikiedit(page, 
+        WikiUtil.getPage(owner, repository, page), 
+        JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
 }
\ No newline at end of file
diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki.scala.html
index 8341b39..089e148 100644
--- a/src/main/twirl/wiki.scala.html
+++ b/src/main/twirl/wiki.scala.html
@@ -1,5 +1,6 @@
 @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
+@import context._
 @main(pageName + " - " + repository.owner + "/" + repository.name){
   @header("wiki", repository)
   <ul class="nav nav-tabs">
@@ -16,7 +17,7 @@
       <li class="pull-right">
         <div class="btn-group">
         <a class="btn" href="#">New Page</a>
-        <a class="btn" href="#">Edit Page</a>
+        <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
         <a class="btn" href="#">Page History</a>
         </div>
       </li>
diff --git a/src/main/twirl/wikiedit.scala.html b/src/main/twirl/wikiedit.scala.html
new file mode 100644
index 0000000..92d468f
--- /dev/null
+++ b/src/main/twirl/wikiedit.scala.html
@@ -0,0 +1,31 @@
+@(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
+@import view.helpers
+@import context._
+@main(pageName + " - " + repository.owner + "/" + repository.name){
+  @header("wiki", repository)
+  <ul class="nav nav-tabs">
+    <li><a href="">Home</a></li>
+    <li><a href="">Pages</a></li>
+    <li><a href="">Wiki History</a></li>
+    <li><a href="">Git Access</a></li>
+  </ul>
+  @page.map { page =>
+    <ul class="nav nav-tabs">
+      <li>
+        <h1 class="wiki-title"><span class="description">Editing</span> @pageName</h1>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+        <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName">View Page</a>
+        <a class="btn" href="#">Delete Page</a>
+        <a class="btn" href="#">Page History</a>
+        </div>
+      </li>
+    </ul>
+    <input type="text" name="page" value="@pageName" style="width: 900px; font-weight: bold;"/>
+    <textarea name="content" style="width: 900px; height: 400px;">@page.content</textarea>
+    <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
+    <input type="submit" value="Save" class="btn btn-primary">
+    <input type="button" value="Preview" class="btn">
+  }
+}
\ No newline at end of file
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index ed24453..6bb6846 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -9,6 +9,7 @@
 
 div.container {
   width: 920px;
+  margin-bottom: 40px;
 }
 
 span.error-message {