Calendar page modal refactoring complete