Work on cleaning up the site migration, + fields editors