More nav improvements