changed text of some labels for #105 and #107
Merge remote-tracking branch 'origin/ribbons' into ribbons