Refactored to use onClick binding