Issue #278, Increase Contrast

See #278 for screenshots of UI changes. (Also a bit of style cleanup.)