Address touch/click issues