diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
index 158cf4e..f7479a8 100644
--- a/src/main/twirl/helper/dropdown.scala.html
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -1,13 +1,13 @@
-@(buttonValue: String = "", prefix: String = "")(body: Html)
-<div class="btn-group">
-  <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-    @if(buttonValue.isEmpty){
+@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "")(body: Html)
+<div class="btn-group"@if(style.nonEmpty){ style="@style"}>
+  <button class="btn dropdown-toggle@if(mini){ btn-mini}" data-toggle="dropdown">
+    @if(value.isEmpty){
       <i class="icon-cog"></i>
     } else {
       @if(prefix.nonEmpty){
         <span class="muted">@prefix:</span>
       }
-      <span class="strong">@buttonValue</span>
+      <span class="strong">@value</span>
     }
     <span class="caret"></span>
   </button>
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html
index e035b9d..c5b4ebb 100644
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -29,52 +29,49 @@
         <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
         <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
       </div>
-      <div class="btn-group">
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          Sort:
-          <span class="strong">
-            @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
-            @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
-            @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
-            @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
-            @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
-            @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-          </span>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li>
-            <a href="@condition.copy(sort="created",  direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="comments", direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
-            </a>
-          </li>
-        </ul>
-      </div>
+      @helper.html.dropdown(
+        value  = (condition.sort, condition.direction) match {
+          case ("created" , "desc") => "Newest"
+          case ("created" , "asc" ) => "Oldest"
+          case ("comments", "desc") => "Most commented"
+          case ("comments", "asc" ) => "Least commented"
+          case ("updated" , "desc") => "Recently updated"
+          case ("updated" , "asc" ) => "Least recently updated"
+        },
+        prefix = "Sort",
+        mini   = false
+      ){
+        <li>
+          <a href="@condition.copy(sort="created",  direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="comments", direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="updated",  direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+          </a>
+        </li>
+      }
       <table class="table table-bordered table-hover table-issues">
       @if(issues.isEmpty){
         <tr>
diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html
index cb8a158..7bc3874 100644
--- a/src/main/twirl/pulls/listparts.scala.html
+++ b/src/main/twirl/pulls/listparts.scala.html
@@ -20,52 +20,49 @@
     <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
       <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
   </div>
-  <div class="btn-group">
-    <button class="btn dropdown-toggle" data-toggle="dropdown">
-      Sort:
-      <span class="strong">
-        @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
-        @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
-        @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
-        @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
-        @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
-        @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-      </span>
-      <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="@condition.copy(sort="created",  direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="comments", direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
-        </a>
-      </li>
-    </ul>
-  </div>
+  @helper.html.dropdown(
+    value  = (condition.sort, condition.direction) match {
+      case ("created" , "desc") => "Newest"
+      case ("created" , "asc" ) => "Oldest"
+      case ("comments", "desc") => "Most commented"
+      case ("comments", "asc" ) => "Least commented"
+      case ("updated" , "desc") => "Recently updated"
+      case ("updated" , "asc" ) => "Least recently updated"
+    },
+    prefix = "Sort",
+    mini   = false
+  ){
+    <li>
+      <a href="@condition.copy(sort="created",  direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="comments", direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="updated",  direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+      </a>
+    </li>
+  }
   <table class="table table-bordered table-hover table-issues">
   @if(issues.isEmpty){
     <tr>
diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html
index 8a5a9eb..6363d5c 100644
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -5,25 +5,16 @@
 <ul class="nav nav-tabs">
   @if(!hideBranchPulldown){
   <li>
-    <div class="btn-group" style="margin-right: 20px;">
-      <button class="btn dropdown-toggle" data-toggle="dropdown">
-        @if(id.length == 40){
-          tree: <span class="strong">@id.substring(0, 10)</span>
-        }
-        @if(repository.branchList.contains(id)){
-          branch: <span class="strong">@id</span>
-        }
-        @if(repository.tags.exists(_.name == id)){
-          tag: <span class="strong">@id</span>
-        }
-        <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu">
-        @repository.branchList.map { branch =>
-          <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@branch">@helper.html.checkicon(id == branch) @branch</a></li>
-        }
-      </ul>
-    </div>
+    @helper.html.dropdown(
+      value  = if(id.length == 40) id.substring(0, 10) else id,
+      prefix = if(id.length == 40) "tree" else if(repository.branchList.contains(id)) "branch" else "tree",
+      mini   = false,
+      style  = "margin-right: 20px;"
+    ){
+      @repository.branchList.map { branch =>
+        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@branch">@helper.html.checkicon(id == branch) @branch</a></li>
+      }
+    }
   </li>
   }
   <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>