Move per-picture content to its own template