Merge pull request #585 from FransTwisk/front-end

Donation fixes