Modified events view and model