edited addClickListener
Merged conflicts with sayyid's