Slightly less tall header
Tweak source ordering