Renamed draft object, fixed bug in grid draft