Layout refactor
Merge pull request #75 from isfit/restyle

Layout refactor