Modifies user page
Resolved merge issues