use new layout