Goal Accessibility Related Improvements

Follow