added fieldset and legend (should consider separating out of form class)