Merge pull request #2 from mkuzio/layout

Layout
Updated tests