fixed layout
Merge branch 'fix_layout'