GEN-112 Cleanup the event view. Fix bugs