Subheader refactor.