renaming some classes for nav
bunch of updates