Bug: Updates messing up layouts