further menu options improvements