Improved HTML markup and CSS