Changes in layouts v2