update layout from V1 to V2