Merge branch 'filling-in-layout' of gitlab.zigexn.vn:phuctm/ThaiMinhPhuc_training into filling-in-layout