Added more buttons, + onClickListener
Merge remote-tracking branch 'origin/master'