Improve shape drawing and add support for ellipses