Support for goal overviews
Tweaks for goal overviews