Changes from last review including separating image and wallpaper code