refactored button clicks
Reverted to 4.0.9