More work on new nav structure