Added payment and buttons
Merge branch 'master' into develop