Change links order
Fix the navigation