Added polygons, editable lines and marker info boxes