Make bubble vc use new layer mechanics