Accept buy page fixes

Here is the PR to fix #642