Added ability to draw and fill rectangle, oval,line