Fix navigation order