Minor correction to support for custom header and custom background