Pushing new nav live, added more criteria
fixed goofy bug