Improve events page