Fixed the picture field, and a little clean up.