Use more consistent names for things
Simplify the post HTML
Make post header HTML consistent