[Double pg flows] revise layouts