Improve Search UI