Added search and slots to toolbar
Some changes