Remove debug code
Slightly alter infobubble layout