PROBCORE-425 Working on Events view