Update layout to v2