Upload layout v.2