added content creation links to user menu
resolved merge conflicts