Added Search + UI enhancements