Some more fixing on nav