replacing signals with smart click handling