Reorganize main nav links