TOC and info/advice/warning boxes added