Better drop add form handling, use fieldset instead of a hacky implementation that was before