some changes in users page
fixed conflicts
redone user info page