Refactor add goal flow

Refactor Add a New Goal flow based on the design.

This resolves #72 
@fcduarte @amitbharadwaj please review.
When you update this branch I'll be able to access this field from the listener.. Then you could change this code at the activity.