correct and improved menu