HR-327 Dashboard markup cleanup
Merge pull request #514 from colemanw/master

HR-327 Dashboard markup cleanup