Resolved usability issue through nested click handlers