Changed NewGoalActivity Slightly