Use the new layout