added more features, calendar, goal button