Iteration 5

Ent/Org typo
User cards changes