Bug fix and image move