calendar_page upgrade and fix