Update layout and reset public structure
Update adminservers with switch