More work on menu options