Fixed member's visibility
Reduced the number of OnClickListener instances