restructure main menu (fixes #1576)

Fixes #1576.