Fix navigation issues