clean up the UI, add a search form.