Updated dashboard events to use events table
Fixed merge conflict