Added Rectangle & Ellipse Drawing