Improving verbiage for button classes.
Fixing user add; improving interface.