Update nav styling, move all content into layout, fix routes