diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala
index ea98d6f6a..cacb60dc5 100644
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -8,6 +8,7 @@ class ScalatraBootstrap extends LifeCycle {
     context.mount(new WikiController, "/*")
     context.mount(new CreateRepositoryController, "/*")
     context.mount(new RepositoryViewerController, "/*")
+    context.mount(new SettingsController, "/*")
     
     context.addListener(new ServletContextListener(){
       def contextInitialized(e: ServletContextEvent): Unit = {
diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala
new file mode 100644
index 000000000..59d08439e
--- /dev/null
+++ b/src/main/scala/app/SettingsController.scala
@@ -0,0 +1,14 @@
+package app
+
+import util.JGitUtil
+
+class SettingsController extends ControllerBase {
+  
+  get("/:owner/:repository/settings") {
+    val owner      = params("owner")
+    val repository = params("repository")
+    
+    html.settings(JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/diff.scala.html
index 8408c2007..859c6e79c 100644
--- a/src/main/twirl/diff.scala.html
+++ b/src/main/twirl/diff.scala.html
@@ -4,7 +4,7 @@
 @diffs.zipWithIndex.map { case (diff, i) =>
   <table class="table table-bordered">
     <tr>
-      <th style="font-weight: normal;">
+      <th style="font-weight: normal;" class="box-header">
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
           @diff.oldPath -> @diff.newPath
         }
diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html
index a88f1d0ff..4080ed678 100644
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -9,7 +9,7 @@
       <li@if(active=="code"){ class="active"}><a href="@path/@repository.owner/@repository.name">Code</a></li>
       <li@if(active=="issue"){ class="active"}><a href="#">Issue</a></li>
       <li@if(active=="wiki"){ class="active"}><a href="@path/@repository.owner/@repository.name/wiki">Wiki</a></li>
-      <li@if(active=="settings"){ class="active"}><a href="#">Settings</a></li>
+      <li@if(active=="settings"){ class="active"}><a href="@path/@repository.owner/@repository.name/settings">Settings</a></li>
     </ul>
   </div>
 </div>
diff --git a/src/main/twirl/settings.scala.html b/src/main/twirl/settings.scala.html
new file mode 100644
index 000000000..2717e60de
--- /dev/null
+++ b/src/main/twirl/settings.scala.html
@@ -0,0 +1,39 @@
+@(repository: app.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@main("Settings"){
+  @header("settings", repository)
+  <form id="form" method="post" action="@path/new" validate="true">
+    <div class="box">
+      <div class="box-header">Settings</div>
+      <div class="box-content">
+        <fieldset>
+          <label for="defaultBranch"><strong>Default Branch</strong></label>
+          <select name="defaultBranch" id="defaultBranch">
+            <option value="master">master</option>
+          </select>
+        </fieldset>
+      </div>
+    </div>
+    <div class="box">
+      <div class="box-header">Features</div>
+        <div class="box-content">
+          <dl>
+            <dt>
+              <label class="checkbox">
+                <input type="checkbox" name="wiki" id="wiki"/> <strong>Wiki</strong>
+              </label>
+            </dt>
+            <dt>
+              <label class="checkbox">
+                <input type="checkbox" name="issue" id="issue"/> <strong>Issue</strong>
+              </label>
+            </dt>
+        </dl>
+      </div>
+    </div>
+    <fieldset>
+      <input type="submit" class="btn btn-primary" value="Apply changes"/>
+      <input type="submit" class="btn btn-danger" value="Delete this repository"/>
+    </fieldset>
+  </form>
+}
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index b50cd3c1d..c701b3c6c 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -73,4 +73,52 @@ h1.wiki-title {
   background-color: white;
   cursor: default;
   width: 350px;
+}
+
+div.box {
+  background-color: #efefef;
+  padding: 2px;
+  margin-bottom: 20px;
+}
+
+div.box-header {
+  font-size: 120%;
+  font-weight: bold;
+  background-color: #e0e0e0;
+  background-image: -moz-linear-gradient(#fafafa, #e0e0e0);
+  background-image: -webkit-linear-gradient(#fafafa, #e0e0e0);
+  background-image: linear-gradient(#fafafa, #e0e0e0);
+  background-repeat: repeat-x;
+  margin: 0;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 1px;
+  border: 1px solid #d8d8d8;
+  border-bottom: none;
+  padding: 10px 10px 11px 10px;
+  text-shadow: 0 1px 0 #fff
+}
+
+div.box-content {
+  background-color: white;
+  border: 1px solid silver;
+  padding: 4px;
+}
+
+th.box-header {
+  background-color: #e0e0e0;
+  background-image: -moz-linear-gradient(#fafafa, #e0e0e0);
+  background-image: -webkit-linear-gradient(#fafafa, #e0e0e0);
+  background-image: linear-gradient(#fafafa, #e0e0e0);
+  background-repeat: repeat-x;
+  margin: 0;
+  border-top-left-radius: 1px;
+  border-top-right-radius: 1px;
+  border: 1px solid #d8d8d8;
+  border-bottom: none;
+  text-shadow: 0 1px 0 #fff
+}
+
+
+dl {
+  margin: 0px;
 }
\ No newline at end of file