Tweaks to the Event views

Added some additional capability to view events correctly.