Put links and comments in a container

This fixes #62 by putting links and comments blocks in a container.