Martin/17 apr sponsor portal fixes