Cleanup, and adding images