Fix layout loading