Fixes: #2219 reorganize the admin and addons menu