(Bug 5051) Re-order navigation link props