Add indicators for menu options
Fix warnings