Degrade bubbles to boxes
Hack for tagging bubbles
Merge branch 'feature/mobile-bubbles' into develop