Updated event view (final - test)