Fixes: 2219 reorganize the admin menu