Remove duplicate type field
Add teams to organization admin inline
Various additions to admin