Continued work on events views