Fix ellipse bounds
Improve menu