Generalize loading images, and other tweaks