diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html
index 2443087..57f75ad 100644
--- a/src/main/twirl/settings/collaborators.scala.html
+++ b/src/main/twirl/settings/collaborators.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @html.main("Settings"){
   @html.header("settings", repository)
-  @menu("collaborators"){
+  @menu("collaborators", repository){
     <h3>Manage Collaborators</h3>
     
     <input type="text" style="width: 300px; margin-bottom: 0px;"/>
diff --git a/src/main/twirl/settings/menu.scala.html b/src/main/twirl/settings/menu.scala.html
index 785dc63..3df4948 100644
--- a/src/main/twirl/settings/menu.scala.html
+++ b/src/main/twirl/settings/menu.scala.html
@@ -1,10 +1,14 @@
-@(active: String)(body: Html)(implicit context: app.Context)
+@(active: String, repository: app.RepositoryInfo)(body: Html)(implicit context: app.Context)
 @import context._
 <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>
+      <li@if(active=="options"){ class="active"}>
+        <a href="@path/@repository.owner/@repository.name/settings/options">Options</a>
+      </li>
+      <li@if(active=="collaborators"){ class="active"}>
+        <a href="@path/@repository.owner/@repository.name/settings/collaborators">Collaborators</a>
+      </li>
    </ul>
   </div>
   <div class="span9">
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index bca9b7e..ae2b976 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @html.main("Settings"){
   @html.header("settings", repository)
-  @menu("options"){
+  @menu("options", repository){
     <form id="form" method="post" action="@path/new" validate="true">
       <div class="box">
         <div class="box-header">Settings</div>