Fix layout mixup