Nav refinment and fixes