Replace UserInfo class with UserModel class, change some UI