Changed views for user page
Resolved merge conflict