re-arrange headers