Feature added: displays events
fixed routes merge conflicts