Worked more on new nav