Updating Layout code
Merge pull request #726 from sylus/master

Updating Layout code