added new features to user model and UI