Fix default bubble style issue, re-use old label and address bugs from #10