purchase page feedback
Merge branch 'issue-151' into develop