updated navigation classes and helpers