EditPage, etc. updated