new nav

fixed few bug