Improve CSS and style