Merge pull request #1 from hayaken/develop

Develop
edit layout