Merge pull request #40 from Gavin-AG/master

layout update
update