Continue tuning drawing, add support for fill outline checkboxes