minor updates to enrollment page
Merge remote-tracking branch 'origin/master' into back-end-working
Improved error handling and reporting.