fixed layouts
Merge pull request #180 from lexoyo/develop

fixed layouts