Moved click control to map. Nicer colors