First part of main header overhaul
Second part of main header overhaul