Changed ToC title and added figure refs when popupFlag = False