More nav fix