Revert "Revert "Menus""

This reverts commit 47c7e3cab92354f47f1958bc8b1aa6d63d6189f7.