Underline position

Merge request to replace all of master — mostly changes to the HTML structure but a bit of CSS updates to go along with the semantic HTML