Bug fixes, remove lightbox, rename bubbles