Updated user and events views