GCP-6018 - UI, validations and form changes