Make search tool more prominent

Move "Search" tool above map +/- buttons, and activate search tool by default.

Also misc simplifications.