Update layout v.2