Continuing after the merge with Tyler's update:  Reworking the event view.