Switched to point-based system for Canvas; fixed missing trs in theads