If you press and hold the mouse button down on the "square" tool, the
circle/ellipse tool pops out as an option. I'm not sure what you mean with the
border issue? Is your zoom level set at 100%? Can you post a screenshot of your
problem?