CSS and markup cleanup