think I finally fixed all the click behavior