navigation issues fixed