CSS and markup tweaks