Fixes on menu links