Modifying control classes to fix new goal page error