fix layout overriding