Improve menu options