Merge pull request #34 from lizrush/layout

Layout
merged users