refactor edit and new forms of site contents