Subheader refactor