Some CSS and HTML updates