Fixed Calendar view workflow