Some more styling and validation at the right place