adjusted layout
Merge branch 'views'