fixed ALL navigation issues