Fixed nav width creep and legacy overlay problem.