Refactored section header modules