Updated layout schema