Moved header out of wrap and reduce the amount of yellow

Up to you if you want to merge this one, I just made the header yellow only.