Re-organising includes; nav include + header styling