Third part of main header overhaul
Fourth and last part of main header overhaul