Fixes to goals pages