navigation issues rectified