added links, table of contents, etc.
resolving merge conflict of popup.html