Add calendar page
Fix merge conflicts