Rework month selection in Calendar modal