Added ControlLayer to work around layer switcher problems