editing sites; improved data model