Better image placement and links.

Fixes #37