moving non widgets related stuff to toolbar bundle