Added validation, remove color fields