Fix nav issue