Fix navigation mess