Reworked navigation

Created a second layout template for the website functions - this
removed some of the duplication required for the navigation menu.