improved menu, almost finished