Refactor calendar marionette work even more
Refactor calendar marionette work even more