Doc markup UI tweaks
Merge branch 'master' of https://github.com/calliopeinitiative/marca

Ron and I were apparently working at the same time