Improved CSS and HTML