Improve the CSS and HTML markup