rpearce/mshah - ordering headers for display