added fieldset, tweaked layout