v2 step2 fix layout