Fix overlay/underlay/mask mixing and mis-identifed mapping mode controls