Update CSS and add validation