Added validation on basic info screen