Refactoring of Calendar view.