migration after FOS + layout fixed