viewby styling
Merge branch 'calendar' into dev