Reopen #60

Reopens #60 to move the `<fieldset>` tag to a different partial