Update 2

-- Problem with Event screen crashing fixed
