Change the code added a onClickListener and more