Updated view of search button
Merge
Fixed bug with waypoints layout