Bug fixes and image replacement