Multiple map controls and layers fixes.
Conflicts merge