Added picture module and cleaned it out a little