Added touch and click handling