fixed some of the nav weirdness, JOSH