fix spelling on buttons
Merge origin/master