Harrogate styling tweaks

Hakim & Mike (hence working directly on staging, will rebase)
Styling work with Mike
category script tweaks