Make header adjustments
Swap headers