Fix search button
Resize map and clean up