Better validation UX
Fixed CSS issues