Replace some hard-wired constants
Cosmetic restyling
Void-safety improvements in GUI classes.