improve search
improve UI