update for ECP 3.6 and header spacing