Added orgs, changed views