various fixes on the grants page
Merge branch 'capright' into testing