More nav improvements.