Updated drawing util to better handle origin offsets