Syntax cleaning + glitch fixed (bubble-view mode)