20100701 edit-page: More magic; the merrier