Added 3 top buttons
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
3 choice buttons
Merge remote-tracking branch 'origin/master'
Choice improvements
Merge remote-tracking branch 'origin/master'