move fields around per review