Minor cleanup
Unregister click handlers before registering new one