Replaced dingy layout with clean layout
Merge branch 'layout'