improved header structure and groups