Fix layout regression
Use different upgrade code for beta