clean up the context more, change how the event view is implemented