Adding more circles, a rectangle, and fixing the interface