Layout overlap fix and rotation disabled