Added onClickListeners for buttons 18-23