Further improvements to menu options so we present options that work