Dashboard and Event views improvements