Return navigation links
Merge branch 'MH-905' into dev