Fix incorrect IDs being used.
Attempted fix for Done button handler.
Fix context issues with node-click handler.