Implement changes according to input from Mariska and add simple validations to mandatory fields.