#3846: Rearrange mark-up and add placeholder help text.