Improve click behavior