Day/week views working
Merge branch 'hotfix/day-week-views'