Fix many bugs in pictures