reorganize some templates to make sense.
fix up the sub header