Lots of changes allowing destroy from modal edit screens, too