More CSS and HTML updates