Markup tweaks

Small markup tweaks with new content