Updated images creation
Fixed bugs