[PATCH 1/6] Integrate common header into existing layout