Improved landing page and calendar
Merge branch 'dev'
Changes to account page