diff --git a/templates/_badgemenu.html b/templates/_badgemenu.html
index 265fa54f..71a3fafc 100644
--- a/templates/_badgemenu.html
+++ b/templates/_badgemenu.html
@@ -1,6 +1,5 @@
 {{define "badge_user"}}
 {{with .User}}
-	<ul class="nav navbar-nav navbar-right">
 		<li class="dropdown">
 			{{if gt .Id 0}}
 		    <a href="{{ genRoute "user_profile" "id" (print .Id) }}" class="dropdown-toggle" data-toggle="dropdown">
@@ -11,10 +10,13 @@
 		        <li><a href="#soon"><i class="fa fa-sign-out"></i> Sign-out</a></li>
 		    </ul>
 		    {{ else }}
-	        <li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> Sign in</a></li>
-	        <li><a href="{{ genRoute "user_register" }}"><i class="fa fa-cog"></i> Sign Up</a></li>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Other<span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> Sign in</a></li>
+                <li><a href="{{ genRoute "user_register" }}"><i class="fa fa-cog"></i> Sign Up</a></li>
+                <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
+            </ul>
 	{{end}}
 		</li>
-	</ul>
 {{end}}
 {{end}}
diff --git a/templates/index.html b/templates/index.html
index 19265138..4f94d59a 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -44,9 +44,9 @@
                   <ul class="nav navbar-nav">
                       <li><a href="{{.URL.Parse "/upload"}}">Upload</a/></li>
                       <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
-                      <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
                       <li><a href="{{ genRouteWithQuery "feed" .URL }}">RSS</a></li>
                       <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
+                      {{block "badge_user" .}}{{end}}
 
                   </ul>
                   <form class="navbar-form navbar-right" role="search" action="/search" method="get">
@@ -55,7 +55,6 @@
                         {{block "search_button" .}}{{end}}
                       </div>
                   </form>
-                  {{block "badge_user" .}}{{end}}
                   <div class="nightswitch">
                       <a href="javascript:toggleNightMode();" ><img id="nighticon" src="/img/moon.png"></a>
                   </div>