Rework front matter