BZ-10557: Review/Refine UX and markup (ec27522)

hopefully this is the last one… keep finding little things