Revert "Merged menus"

This reverts commit e8ce409d78ac19c79c972915c4e425b1b32d864a.