Fix layout details