match colours and refactor the top nav bar