Moved sponsors around
Merge with master