Updates to make tests work properly and markup styling

* Tests work as expected
* Markup was updated to fix the navigation bar and be a bit more reflective of the intended structure of the document.