Removed primary menu alter and used function instead
Merge conflict