Forms and Validators moved to the right place