Fix error
Fix layout
Merge pull request #253 from eko/master

Fix layout to render well
Merge branch 'sonata/master'