UI fixes, search bug fix, and tests