Fix layout #19