Updates for menu links
Fixed conflicts