#652 - fix issues preventing base layer menu from being editted
so we can remove the satellite base layer
#652 - attempt to address review comments
Merge pull request #738 from aodn/issue-652

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