Aviary editing

Everywhere