Style fix and headerid extension