Fix layout drama