Markup and CSS cleanup