ISSUE #20 - Fixed clicking interactions