updated the view for the events page
Merge branch 'daltonbranch' into dev