added User class
merged changes to profile account view