Fix Pictures Bugs