Replace the edit functionality and fix a few app level gotchas.