Fix glitchy navigation