new layout
Merge branch 'new_layout'