changed user profile nav
resolved merge conflicts