template fixes after gov.uk header updates and manual updates