fixed navigation issues