Add validation and style