Updated DrawForm, added wrap option for fieldset shouldWrap()