Fix layout, add speakers