Add OnClickListener. Minor fixes.