Fixed search and geo location, ui tweaks