Added one-click confirmation functionality
Merged one-click confirmation branch