Fixing nav issue
Manually migrating change from develop