MOD: finish goal, and adjust scroll view after goal removed from main container.