Updates to Contribution and site templates