Cleaning up, adding links to images