Added Calendar to form_goal.xml and GoalForm