Better place for the last figure and add non-numbered chapter in toc.