fix baselayer toggle

@yhahn quick review?