Added control list to editor, made fill mode single use