Reorder logic in admin_controller to allow for more control over the menu