HR-327 Dashboard markup cleanup