Fixed buttons and added comments.

As rectangles the dist did not work, but with ellipses it does.