Make headers consistent

This will allow easier manipulation of the content vs the header
when considering future messages placement, or similar semantic
parts of the page.
Update layout of all user-related templates