Layout minor  alteration