udpated users page
merge all