Rework some headers in posts