Merge pull request #1435 from guardian/move-cancel-btn-us-only

Merge pull request #1435 from guardian/move-cancel-btn-us-only #558