More styling and validation