Added onClickListeners for 6 more buttons