Remove toggle overlays and adjust branding for CM