Event description view
merge fix