Add validation and style fixes