Calendar of Events: Fixed arrowing to previous/next month (fixes #5549)

Also switched to JEP model at the same time.