Some updates to EditPage and ExternalEdit: