user model added
Refactored user names and captions