Refacor the click logic, adds menu, changes the icon