Merge pull request #29 from Gavin-AG/master

layout update
update