new layout, fixed #9