implemented search, more UI changes