updated structure so that we can always expect a dictionary for layout keys