better click handling