Fixed layout conflicts