Fixed overfapping bug with bubbles and edges

<3
merged files