added onclick listeners for all buttons
Merge branch 'steven'