Tidying up spacing and navigation html