Convert NOLA to new default layout