Separate delete button from settings form. Fixes #513