Merge pull request #1 from realrearwheel/master

update layout