Simplify post structure by moving post-header template into post layout