fixing layout duplication