Fixed color filling with polygon
Added zindex support for all shapes
Enhanced rendering of circle