User :id page addition
Resolve merge conflicts