Correction on navigation links
Merge branch 'DDBNEXT-656' into develop