Merge branch 'layout-bootstrap'