Yet another layout tweak, returned to bubbles