Merge pull request #20 from Gavin-AG/master

layout update
pay init