Updated overall header/footer and index body templates to organise primary navigation links more relevantly