Update to new layout.