header form fixes