Refactored to remove calendar utils and fix date page.