It works better if we're consistent with class names!
More descriptive training category messages, plus tweak other parts of the display