Fix conflicts between clicked and activated
Also add the widget to the public API