added search button + minor fixes