Added buttons and onClickListener