Updated deps
Updated page layouts. Found another bug dealing with array/objects. Not sure how this wasn't found before?
Updated machado.
resolved conflicts.