YH-439: Separated calendar views