Style and markup tweaks