Improved look for upcoming events