Adding validation and forms