Fixes: #2071 reorganize the admin menu