Added button and enter listener on search