Getting closer

Cleaning up, organizing.  More label styles (for image backgrounds,
especially)