Jackie - fix main nag + header & footer