Merge pull request #24 from Gavin-AG/master

layout update
layout update