Move some more tools out of GeoExplorer.js and onto map templates
Replace hard-coded tool separators with css