CSS and html fixes