Changed event view to be better