Show calendar at top view
Merge branch 'develop'