can the OnClickListener be re-factored? This bit of code is used in two places.