Tidy up span in header