Added wrappers to editor form