A bunch more work on menus