Added in Pictures, tidied up