navigation issues resolved