improved header, footer