More work on nav