Merged UI enhancements with search.