Added images to events and improved errors manegement.