Bubble layer
Revert "Bubble layer"

This reverts commit ec65bc6a103d5a15ea1ab13b465f24bd15f95811.