Tweaks to beneficiary UI and minor code cleanup