Fixed important navigation issues