Bugfix
Bugfix & remaining images