Fix layout to find the machine