changes to layout and a fix to remove old events correctly