More changes to the HTML and NAV