styled profile page
resolved merge conflict