refactoring to enable better UI for goals