[new] Finally fixed the picture bugs