diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala
index 59d0843..7d34ee3 100644
--- a/src/main/scala/app/SettingsController.scala
+++ b/src/main/scala/app/SettingsController.scala
@@ -7,8 +7,14 @@
   get("/:owner/:repository/settings") {
     val owner      = params("owner")
     val repository = params("repository")
+    redirect("/%s/%s/settings/options".format(owner, repository))
+  }
+  
+  get("/:owner/:repository/settings/options") {
+    val owner      = params("owner")
+    val repository = params("repository")
     
-    html.settings(JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+    settings.html.options(JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
 
 }
\ No newline at end of file
diff --git a/src/main/twirl/settings.scala.html b/src/main/twirl/settings.scala.html
deleted file mode 100644
index 2717e60..0000000
--- a/src/main/twirl/settings.scala.html
+++ /dev/null
@@ -1,39 +0,0 @@
-@(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/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
new file mode 100644
index 0000000..2c1dc02
--- /dev/null
+++ b/src/main/twirl/settings/options.scala.html
@@ -0,0 +1,75 @@
+@(repository: app.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@html.main("Settings"){
+  @html.header("settings", repository)
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-tabs nav-stacked">
+        <li class="active"><a href="@path/settings/options">Options</a></li>
+        <li><a href="@path/settings/collaborators">Collaborators</a></li>
+     </ul>
+    </div>
+    <div class="span9">
+      <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>
+            <hr>
+            <fieldset>
+              <label><strong>Repository Type</strong></label>
+              <label>
+                <input type="radio" name="repositoryType" value="0" checked>
+                <strong>Public</strong> - All users and guests can read this repository.
+              </label>
+              <label>
+                <input type="radio" name="repositoryType" value="1">
+                <strong>Private</strong> - Only collaborators can read this repository.
+              </label>
+            </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>
+              <dd>
+                Adds lightweight Wiki system to this repository.
+                This is the simplest way to provide documentation or examples.
+                Only collaborators can edit Wiki pages.
+              </dd>
+            </dl>
+            <hr>
+            <dl>
+              <dt>
+                <label class="checkbox">
+                  <input type="checkbox" name="issue" id="issue"/> <strong>Issue</strong>
+                </label>
+              </dt>
+              <dd>
+                Adds lightweight issue tracking integrated with this repository.
+                All users who have signed in and can access this repository can register an issue.
+              </dd>
+            </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>
+    </div>
+  </div>
+}
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 9fd62ea..2622f5b 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -143,4 +143,13 @@
 
 dl {
   margin: 0px;
+}
+
+dd {
+  margin-left: 20px;
+}
+
+hr {
+  margin-top: 4px;
+  margin-bottom: 4px;
 }
\ No newline at end of file