improved menu handeling