Minor nav improvements