Added styling and validation
Fixed problem with error handling