New view
Fixes for linking of navigation
Linking fixed