Overlay + Underlay merge to Layer.
Animation dropped.
Minor improvements.