PLGCT-27 Rework the contribution wizard