Fixed up the nav, some styling stuff still to sort