diff --git a/messages/en.msg b/messages/en.msg
index c3fa118..5a8fcb0 100644
--- a/messages/en.msg
+++ b/messages/en.msg
@@ -55,3 +55,4 @@ AddExtraPoints: add points freely
 ExtraPointsPoints: Points to be added
 ExtraPointsDescription: Describe why they are added
 User: User
+Manage: manage
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 9133bf0..012689f 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -10,9 +10,12 @@
                 <li><a href="@{TagsR}">_{MsgListTags}</a>
                 <li><a href="@{AchievementsR}">_{MsgAchievements}</a>
                 $if userIsAdmin $ entityVal user
-                    <li><a href="@{CreateChallengeR}">_{MsgCreateChallenge}</a>
-                    <li><a href="@{CreateResetLinkR}">_{MsgCreateResetLink}</a>
-                    <li><a href="@{ExtraPointsR}">_{MsgAddExtraPoints}</a>
+                    <li class="dropdown">
+                        <a id="admin" href="#" class="dropdown-toggle" data-toggle="dropdown">_{MsgManage}<span class="caret"></span>
+                        <ul class="dropdown-menu">
+                            <li><a href="@{CreateChallengeR}">_{MsgCreateChallenge}</a>
+                            <li><a href="@{CreateResetLinkR}">_{MsgCreateResetLink}</a>
+                            <li><a href="@{ExtraPointsR}">_{MsgAddExtraPoints}</a>
 
           <ul class="nav navbar-nav navbar-right">
             <li class="dropdown">