Update Navbar

Introduces Content Modularisation and places the Navbar prior to the main container