Fix primary key for phone numbers and refactor username references.
Since user is referenced a lot, it should be listed first.