Update with toc:nil and image boarder setting implemented