More UI changes. Fixed search.