click handling fixes