More nav tidying