diff --git a/inc/template.php b/inc/template.php
index ca4b6327d21e544553d72f6ec8a8ea22fc89da46..d6b7af1e8b8c24adff2a281eb94805bd918bd04b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1263,6 +1263,7 @@ function tpl_actiondropdown($empty='',$button='>'){
     global $auth;
 
     echo '<form action="' . DOKU_SCRIPT . '" method="post" accept-charset="utf-8">';
+    echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
     echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
@@ -1274,20 +1275,26 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
         $act = tpl_get_action('edit');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('revisions');
+        $act = tpl_get_action('revert');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('revert');
+        $act = tpl_get_action('revisions');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
         $act = tpl_get_action('backlink');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-    echo '</optgroup>';
+
+        $act = tpl_get_action('subscribe');
+        if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
+        echo '</optgroup>';
 
     echo '<optgroup label="'.$lang['site_tools'].'">';
         $act = tpl_get_action('recent');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
+        $act = tpl_get_action('media');
+        if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
+
         $act = tpl_get_action('index');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
     echo '</optgroup>';
@@ -1296,10 +1303,10 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
         $act = tpl_get_action('login');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('profile');
+        $act = tpl_get_action('register');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
-        $act = tpl_get_action('subscribe');
+        $act = tpl_get_action('profile');
         if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
 
         $act = tpl_get_action('admin');
@@ -1308,6 +1315,7 @@ function tpl_actiondropdown($empty='',$button='&gt;'){
 
     echo '</select>';
     echo '<input type="submit" value="'.$button.'" />';
+    echo '</div>';
     echo '</form>';
 }