fix benefit bubble layout, code cleanup