Header changes to match v3 mockup