Merge pull request #30 from Gavin-AG/master

layout update
customer update