Revamp images. Fixes #1?