Improved HTML and CSS