Added clear button to search field

And other cleanup