Feature/merge donations into refactor detail page

This merges dev/donations into refactor/detail-page so we can cleanly merge that back into dev/donations