Fixed shapes not drawing
Added changing group shape