Nav menu class methods refactored/split up