Changed the location of picture management.