Added draft of popup click handling for demonstate purpose