More cleanups in event view

still not working