Reorganize header CSS a bit more