#652 - fix issues preventing base layer menu from being editted

so we can remove the satellite base layer