Fixed navigation transition. Still need to fix pop.