More tweaks to header