Fix ranking
DRY form sync

It's awesome, isn't it @mekanics / @swissmanu? ;)