More changes to artwork; hopefully more flexible now.