BZ-10557: Review/Refine UX and markup