Adjusted layout; kitchen and cookery classroom swapped around.