Moved clear search fields and search buttons
Fixed behaviour of the clear search fields button.