Improve image rendering.
Closes #13