Bug fix and image replacement