Fix layout not saving workspace state