organization, menu updates, and more testing crift