added +/- button, search-function changes