Markup tweaks for styling