Refactored box click