Menu reorganization for 43

António Fernandesrequested to merge
wip/antoniof/menu-reorganization into master

/cc @aday @coreyberla @p3732

Also closes #2330 (closed)

Edited by António Fernandes

Merge request reports