Fixing bugs with LayerList, adding masks toggle