Refactor add goal flow

Refactor Add a New Goal flow based on the design.

@fcduarte @amitbharadwaj please review.