big fixes on nav