Add second element to layout, fix bug with events