Added DailyGoal and WeeklyGoal to Activity
Shorthands in settings