Improve the search UI a little bit