Added mockup for user page
Resolved merge conflict