CSS and HTML improvements