More ui improvements. Fixed searching.